virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
57,833 Commits 37 Branches 400 Tags 458 MiB
a75bf4e5c1
Commit Graph

57833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a75bf4e5c1 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 11:54:19 +01:00
Michael Niedermayer
8a701ef7dd avcodec/hevc_sei: Fix null dereference in decode_pic_timing() 
Fixes Ticket3106

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 02:19:28 +01:00
Michael Niedermayer
63a37d0e1e avcodec/hevc_sei: check active_seq_parameter_set_id validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 02:13:55 +01:00
Michael Niedermayer
6e87dfb589 mpegvideo: reduce whitespace differences to libav 
This excludes many changes that worsen readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:24:01 +01:00
Michael Niedermayer
4fb1221e66 h264: reduce whitespace differences to libav 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:16:31 +01:00
James Zern
23c03ac91e libvpxenc: allow qmax of 0 
this is valid for both vp8 & vp9 and necessary for lossless in the
latter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:00:16 +01:00
Timothy Gu
50f52a5498 avutil/xtea: add Doxy @file and group 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 00:59:38 +01:00
Timothy Gu
624672fcce avutil/adler32: add Doxy group 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 00:58:31 +01:00
James Zern
517afd72c6 libvpxenc: add VP9 options 
same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 00:35:15 +01:00
James Zern
e87043bb1f MAINTAINERS: add myself for libvpx* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 00:34:04 +01:00
Michael Niedermayer
1fb3b494fa ffv1enc: store 2pass statistics at the end 
This reduces their size from O(n) to O(1)

Fixes Ticket3078

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 22:52:52 +01:00
Michael Niedermayer
8d88ed9a1f avcodec/ffv1enc: pass through pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 22:52:52 +01:00
Rudolf Polzer
34a0ac41a8 vf_aspect: support variables in evaluating the aspect ratios 
Example: -vf setsar=sar="sar*9/10"

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:14:08 +01:00
James Zern
a8bcc956fd libvpxenc: split vp8/vp9 options array 
the current options are left for both to provide command line compatibility

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 20:35:12 +01:00
Timothy Gu
d3211cfaed avcodec/libmp3lame: add ABR support 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:44:20 +01:00
Michael Niedermayer
67d1d06225 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Add #endif comments for better readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:37:21 +01:00
Michael Niedermayer
1654e64bba Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58' 
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:31:41 +01:00
Michael Niedermayer
a805e2e653 avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:24:24 +01:00
Michael Niedermayer
35594c48ca libavcodec/hevc: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 17:28:44 +01:00
Michael Niedermayer
2c4f573696 libavcodec/hevc: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 15:32:15 +01:00
Michael Niedermayer
e877455ff9 libavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 15:11:41 +01:00
Michael Niedermayer
42dbe2d9b1 libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:42:57 +01:00
Michael Niedermayer
69b3668b83 libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:36:59 +01:00
Michael Niedermayer
6a84d17bd7 libavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:30:22 +01:00
Michael Niedermayer
b23692b3a8 libavcodec/hevc: reduce whitespace differences to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:10:21 +01:00
Diego Biurrun
5928b29f53 os_support: Add #endif comments for better readability 2013-11-02 13:57:03 +01:00
Michael Niedermayer
1a6948fa70 libavcodec/hevc: reduce bracket differences to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 13:09:31 +01:00
Michael Niedermayer
ce7f1c76bd avcodec/hevc: more whitespaces to reduce difference to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 12:33:54 +01:00
Vittorio Giovara
c68d4c230a mpeg4video_parser: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-02 12:08:49 +01:00
Michael Niedermayer
641358addc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:38:03 +01:00
Michael Niedermayer
1344c04536 Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0' 
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:30:30 +01:00
Michael Niedermayer
0b82fdcc46 Merge commit '037fea388e0df2a22441bc1ed86794152161baf1' 
* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
	libavcodec/flashsv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:19:12 +01:00
Michael Niedermayer
7146eacfc5 Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839' 
* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:13:14 +01:00
Michael Niedermayer
0db04ca01d Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f' 
* commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f':
  configure: Properly check for availability of -Wno-foo warning flags

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:04:07 +01:00
Michael Niedermayer
b4f95c96a5 Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260' 
* commit '23157d72b565e0228fec97f1eb059d4f8021a260':
  configure: Split test_cflags function off from check_cflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:55:47 +01:00
Martin Storsjö
435214a757 Add an HDS live fragmenting muxer 
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-02 10:51:00 +02:00
Michael Niedermayer
02223f4dc4 Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245' 
* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
  lavf: do not use int to store an int64

Conflicts:
	libavformat/utils.c

See: ad56535dd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:48:34 +01:00
Michael Niedermayer
525289ed26 Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1' 
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
	libavcodec/flashsv.c

See: 880c73cd76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:39:51 +01:00
Michael Niedermayer
77c33424c1 Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573' 
* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
  flashsv: Refactor a little

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:33:34 +01:00
Michael Niedermayer
8183e33225 h264_refs: use named constant for setting frame_recovered 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:31:12 +01:00
Michael Niedermayer
647adc4290 h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 01:02:21 +01:00
Michael Niedermayer
f578e5d937 avcodec/hevc: Adjust white-spaces to reduce difference to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 00:44:54 +01:00
Mickaël Raulet
38612379bf hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 00:44:54 +01:00
Vittorio Giovara
dc6ea00cd2 mpeg4video: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-01 22:53:48 +01:00
Luca Barbato
037fea388e flashsv: K&R formatting cosmetics 
Also improve some log message wording/spelling.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-01 22:32:53 +01:00
Diego Biurrun
1700b4e678 x86: vp8dsp: Split loopfilter code into a separate file 2013-11-01 22:05:20 +01:00
Diego Biurrun
056fd4fe65 configure: Properly check for availability of -Wno-foo warning flags 
For some weird reason gcc does not check if the -Wno disabling variants
of warning flags match existing warning flags. Instead it swallows them
silently. That is, unless other warning or error messages are generated,
because then - for some even more bizarre reason - a complaint about the
unknown disable warning flag is issued along with the error or warning
message.

Thus to check for the availability of a warning disabling option, one
needs to check for the enabling variant instead and then add the
disabling variant to CFLAGS.
 2013-11-01 22:05:20 +01:00
Diego Biurrun
23157d72b5 configure: Split test_cflags function off from check_cflags 
This is useful to test flags without directly adding them to CFLAGS.
 2013-11-01 22:05:20 +01:00
Anton Khirnov
d1c229cdbc lavf: do not use int to store an int64 2013-11-01 21:01:32 +01:00
Paul B Mahol
0610d6e8ae avcodec/mvcdec: stop using deprecated avcodec_set_dimensions() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-01 19:05:35 +00:00