aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/concatdec: Use correct stream count on closeTimo Rothenpieler2016-04-111-1/+1
|
* doc/filters: document testsrc2 source filterLou Logan2016-04-111-1/+6
| | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* swscale/arm: add yuv2planeX_8_neonMatthieu Bouron2016-04-113-0/+86
|
* doc/examples/muxing: Add support to pass flags to muxer as since codecpar ↵Michael Niedermayer2016-04-111-2/+4
| | | | | | the codec flags are not available to the muxer anymore Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'Derek Buitenhuis2016-04-111-0/+19
|\ | | | | | | | | | | | | * commit '567d6d5f9d1400f00445183b3477391f58979aa3': avprobe: add local per-stream state Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avprobe: add local per-stream stateAnton Khirnov2016-02-261-0/+20
| | | | | | | | This will be useful in the following commits.
* | Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'Derek Buitenhuis2016-04-111-27/+36
|\| | | | | | | | | | | | | * commit 'c9478410c68c04261f9cfcd80474607e50bd1852': avprobe: add local per-file state Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avprobe: add local per-file stateAnton Khirnov2016-02-261-15/+23
| | | | | | | | | | Do not pass just a bare AVFormatContext pointer around, wrap it in struct. This will be useful in the following commits.
* | Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'Derek Buitenhuis2016-04-111-2/+1
|\| | | | | | | | | | | | | * commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b': mpegvideo_enc: use avcodec_free_context() instead of av_free() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegvideo_enc: use avcodec_free_context() instead of av_free()Anton Khirnov2016-02-261-2/+1
| |
* | Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'Derek Buitenhuis2016-04-111-13/+5
|\| | | | | | | | | | | | | * commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7': avprobe: print information from the codec descriptor Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avprobe: print information from the codec descriptorAnton Khirnov2016-02-261-5/+7
| | | | | | | | | | avprobe is not doing any decoding, so this is more correct than printing information from a random codec implementation.
* | Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'Derek Buitenhuis2016-04-111-118/+117
|\| | | | | | | | | | | | | * commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd': avprobe: remove a pointless condition and a dead branch Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avprobe: remove a pointless condition and a dead branchAnton Khirnov2016-02-261-66/+63
| | | | | | | | AVStream.codec is always non-NULL
* | sws/aarch64: add ff_yuv2planeX_8_neonClément Bœsch2016-04-114-1/+76
| |
* | Merge commit 'dc4983d78af2a666461654067d2e5d45b835358a'Derek Buitenhuis2016-04-110-0/+0
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit 'dc4983d78af2a666461654067d2e5d45b835358a': APIchanges: add missing hashes and dates Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * APIchanges: add missing hashes and datesAnton Khirnov2016-02-261-37/+35
| | | | | | | | Also, remove a stray line (apparently fallout from conflict resolution).
* | Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'Derek Buitenhuis2016-04-112-1/+4
|\| | | | | | | | | | | | | * commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc': lavf: add a missing bump and APIchanges for the codecpar switch Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: add a missing bump and APIchanges for the codecpar switchAnton Khirnov2016-02-262-1/+4
| |
* | Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43'Derek Buitenhuis2016-04-111-6/+19
|\| | | | | | | | | | | | | * commit 'e66fa35392cd45d0a80774cd057fb765d60def43': vc1dec: Check group allocations separatedly Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vc1dec: Check group allocations separatedlyVittorio Giovara2016-02-251-6/+19
| | | | | | | | This avoids accessing NULL pointers in case of error.
* | Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'Derek Buitenhuis2016-04-110-0/+0
|\| | | | | | | | | | | | | | | | | This commit is a no-op. We already did this. * commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596': vc1dec: Fix leak on error for array allocations Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vc1dec: Fix leak on error for array allocationsVittorio Giovara2016-02-251-2/+5
| | | | | | | | | | The deinit function in the 'error' section will correctly free everything.
* | Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'Derek Buitenhuis2016-04-111-11/+5
|\| | | | | | | | | | | | | * commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f': vc1dec: Properly call deinit function on error Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vc1dec: Properly call deinit function on errorVittorio Giovara2016-02-251-11/+5
| |
* | Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'Derek Buitenhuis2016-04-111-8/+0
|\| | | | | | | | | | | | | * commit '35b1cd343cd703c1b0fc926dc43a92141a357380': vc1dec: Drop commented out cruft Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vc1dec: Drop commented out cruftVittorio Giovara2016-02-251-8/+0
| |
* | Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'Derek Buitenhuis2016-04-111-2/+2
|\| | | | | | | | | | | | | * commit 'fa55addd23c2f168163175aee17adb125c2c0710': img2: Drop av_ prefix for a static function Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * img2: Drop av_ prefix for a static functionVittorio Giovara2016-02-241-2/+2
| | | | | | | | | | | | This prefix is reserved for public functions only. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'Derek Buitenhuis2016-04-110-0/+0
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6': idct: Only build prores IDCT if ProRes decoder is enabled Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * idct: Only build prores IDCT if ProRes decoder is enabledDiego Biurrun2016-02-241-0/+2
| |
* | Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'Derek Buitenhuis2016-04-111-6/+28
|\| | | | | | | | | | | | | * commit '3c53627ac17fc6bdea5029be57da1e03b32d265d': qsvdec: store the sync point in heap memory Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvdec: store the sync point in heap memoryAnton Khirnov2016-02-241-6/+28
| | | | | | | | The reasoning is the same as for the corresponding qsvenc patch.
* | Merge commit 'a1335149fd610b16459d9281b611282cac51c950'Derek Buitenhuis2016-04-111-6/+16
|\| | | | | | | | | | | | | * commit 'a1335149fd610b16459d9281b611282cac51c950': qsvenc: store the sync point in heap memory Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: store the sync point in heap memoryMaxym Dmytrychenko2016-02-241-7/+18
| | | | | | | | | | | | | | | | The QSV runtime expects the sync point address passed to MFXVideoENCODE_EncodeFrameAsync() to be valid until MFXVideoCORE_SyncOperation(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'Derek Buitenhuis2016-04-111-25/+34
|\| | | | | | | | | | | | | * commit '1138eb5509d3db7f6d565cb45f137a786d22beb9': vsrc_movie: convert to codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vsrc_movie: convert to codecparAnton Khirnov2016-02-241-4/+12
| |
* | Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01'Derek Buitenhuis2016-04-111-17/+49
|\| | | | | | | | | | | | | * commit 'ac6d53589f3631ae08467c784fb371a15c957f01': examples/transcode_aac: convert to codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * examples/transcode_aac: convert to codecparAnton Khirnov2016-02-241-17/+49
| |
* | Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'Derek Buitenhuis2016-04-111-6/+6
|\| | | | | | | | | | | | | * commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a': examples/qsvdec: convert to codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * examples/qsvdec: convert to codecparAnton Khirnov2016-02-241-6/+6
| |
* | Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'Derek Buitenhuis2016-04-111-13/+33
|\| | | | | | | | | | | | | * commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7': examples/output: convert to codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * examples/output: convert to codecparAnton Khirnov2016-02-241-17/+43
| |
* | avcodec/shorten: properly handle bitshift > 31Paul B Mahol2016-04-111-3/+7
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/hdsenc: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/dashenc: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/segment: Pass flags to child contextMichael Niedermayer2016-04-111-0/+1
| | | | | | | | | | | | This is needed as the bitexact flag is not in the codecpar context, and thus not copied Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avdevice/caca: switch to codecparMichael Niedermayer2016-04-111-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: fix sample dependencies for fate-{a,v}filter testsJames Almer2016-04-102-25/+26
| |
* | Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'Derek Buitenhuis2016-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | This commit is a no-op. We want to do this ourselves since avplay and ffplay differ quite a bit. * commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70': avplay: convert do codecpar Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>