summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avfilter/avf_showcqt: improve pts handlingMuhammad Faiz2016-02-17
| | | | | | | | | | | correct output pts based on input pts make seeking possible output frame one by one on eof tested with showinfo filter Suggested-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/eatqi: print error on mb decode failureMichael Niedermayer2016-02-17
| | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_drawbox: reindentPaul B Mahol2016-02-17
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_drawbox: add alpha pixel formats supportPaul B Mahol2016-02-17
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swscale/x86/output: Fix yuv2planeX_16* with unaligned destinationMichael Niedermayer2016-02-17
| | | | | Reviewed-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/x86/output: Move code into yuv2planeX_mainloopMichael Niedermayer2016-02-17
| | | | | Reviewed-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg12: Remove duplicate block_last_index setting codeMichael Niedermayer2016-02-16
| | | | | | Based on 7c25ffe070c286874a8c3513f7504b90e1626b0c and 58dd885f9ae7feee002773253e345e11e7142739 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg12: Fix error returnMichael Niedermayer2016-02-16
| | | | | | Also remove a tab Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: fix potential integer overflowMichael Niedermayer2016-02-16
| | | | | | This is not a regression Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mov: Fix leftover merge conflict cruftDerek Buitenhuis2016-02-16
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'Derek Buitenhuis2016-02-16
|\ | | | | | | | | | | | | | | | | This commit is a no-op. * commit '5eb562831b3a9bea8026c413ef1338e06450d005': mov: Use the correct type for size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Use the correct type for sizeLuca Barbato2016-02-14
| | | | | | | | | | | | An AVIO offset is int64_t. Bug-Id: 921
* | Merge commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2': vdpau: Support for VDPAU accelerated HEVC decoding Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vdpau: Support for VDPAU accelerated HEVC decodingPhilip Langdale2016-02-13
| | | | | | | | | | Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit '8958c5c64d05453204642b55a7b8b44c93023b17': hevc: Track long and short term RPS size for VDPAU Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * hevc: Track long and short term RPS size for VDPAUPhilip Langdale2016-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today, we track the short term RPS size for DXVA, but only if the SliceHeader RPS is being used. Otherwise it's left uninitialized. NVIDIA's VDPAU implementation requires that the size be accurately tracked even if an SPS RPS is being used. In this case, it's really counting the size of the RPS idx information, but you end up with mangled output if the value is not accurate. VDPAU also needs the size of the long term RPS. Signed-off-by: Philip Langdale <philipl@overt.org> Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27': dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dxva2_hevc: properly signal the num_delta_pocs from the SPS RPSHendrik Leppkes2016-02-13
| | | | | | | | | | | | | | | | | | ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS, and not the final computed value from the slice header RPS, as this calculation is done internally by the driver again. Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
* | Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad': lavf: Dump the cpb side data information Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: Dump the cpb side data informationLuca Barbato2016-02-13
| |
* | Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | | | This commit is a no-op. Ours should be superior. * commit 'd005ccc630e42daab8ec2afecf972d1551a9401a': nvenc: rename a misnamed function nvenc: merge input and output surface structs nvenc: factor out the pixel format list Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * nvenc: rename a misnamed functionAnton Khirnov2016-02-12
| | | | | | | | | | This function copies the encoded bistream into the caller's packet, calling it 'get_frame' is misleading.
| * nvenc: merge input and output surface structsAnton Khirnov2016-02-12
| | | | | | | | | | An input frame always corresponds to exactly one output packet, so there is no point in complicating the situation by managing them separately.
| * nvenc: factor out the pixel format listAnton Khirnov2016-02-12
| |
* | Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266': buffersrc: do not discard the error from ff_filter_frame() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * buffersrc: do not discard the error from ff_filter_frame()Anton Khirnov2016-02-12
| |
* | Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437': eatqi: Remove MpegEncContext dependency Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * eatqi: Remove MpegEncContext dependencyVittorio Giovara2016-02-09
| | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '7c25ffe070c286874a8c3513f7504b90e1626b0c': mpeg1: Make intra-block decoding independent of MpegEncContext Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpeg1: Make intra-block decoding independent of MpegEncContextVittorio Giovara2016-02-09
| | | | | | | | | | | | | | This allows untangling the eatqi decoder from the MPEG-1 decoder. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '249827f736db4c94dfcb24a3883aa4c04f9b119b': mpeg12dec: Refactor mpeg1_decode_block_intra() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpeg12dec: Refactor mpeg1_decode_block_intra()Diego Biurrun2016-02-09
| | | | | | | | | | Reduce variable scope, improve variable name, drop pointless ff_dlog(), merge variable declaration and initialization, whitespace cosmetics.
* | Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604': mpeg12dec: Always close reader on error Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpeg12dec: Always close reader on errorVittorio Giovara2016-02-09
| | | | | | | | | | | | | | A reader left open may lead to hangs. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avfilter/f_streamselect: check if map is availablePaul B Mahol2016-02-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '7a00653be6b13131ce1b2cdeca696429f57caaf8': tiny_psnr: Support large files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * tiny_psnr: Support large filesThomas Lee2016-02-09
| | | | | | | | | | | | | | If an input file is bigger than 2GB (assume sizeof(int) == 4)), size0/size1 will overflow, making stddev and PSNR invalid. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | doc/filters: remove redundant exampleLou Logan2016-02-16
| | | | | | | | | | | | Newer example in blend from f80b475 is faster and simpler. Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. FFmpeg already has this. * commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae': dnxhd: Make the encoder message friendlier Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dnxhd: Make the encoder message friendlierLuca Barbato2016-02-09
| |
* | Merge commit '34c9eba982c75196392a3b0b245dd34297c4511d'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '34c9eba982c75196392a3b0b245dd34297c4511d': configure: Refactor toolchain flag setting Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * configure: Refactor toolchain flag settingDiego Biurrun2016-02-09
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | This commit is a no-op. I don't want to enrange Certain People who like to --disable-*. * commit 'dd53af4b37c7790ce26065b36d5655c1af38b295': avplay: drop support for building without lavfi Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avplay: drop support for building without lavfiAnton Khirnov2016-02-09
| | | | | | | | | | | | lavfi has been considered to be stable for a while now, so it is enabled in most configurations. Supporting avplay without lavfi requires a lot of nontrivial ifdef mess for no good reason.
* | Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | This commit is a no-op. * commit '5781bfae0cf4271278a8bea176d615cb5c222335': flacenc: Load default prediction_order parameters if none is selected asfdec: make sure packet_size is non-zero before seeking asfdec: check for too small size in asf_read_unknown asfdec: check avio_skip in asf_read_simple_index asfdec: break if EOF is reached after asf_read_packet_header Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * flacenc: Load default prediction_order parameters if none is selectedMichael Niedermayer2016-02-08
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * asfdec: make sure packet_size is non-zero before seekingAndreas Cadhalpun2016-02-07
| | | | | | | | | | | | | | This fixes infinite loops due to seeking back. Signed-off-by: Alexandra Hájková <alexandra@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * asfdec: check for too small size in asf_read_unknownAndreas Cadhalpun2016-02-07
| | | | | | | | | | | | | | This fixes infinite loops due to seeking back. Signed-off-by: Alexandra Hájková <alexandra@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * asfdec: check avio_skip in asf_read_simple_indexAndreas Cadhalpun2016-02-07
| | | | | | | | | | | | | | | | The loop can be very long, even though the file is very short. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Alexandra Hájková <alexandra@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * asfdec: break if EOF is reached after asf_read_packet_headerAndreas Cadhalpun2016-02-07
| | | | | | | | | | | | | | | | | | | | | | asf_read_payload can unset eof_reached, so check it also before calling that function. This fixes infinite loops. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Alexandra Hájková <alexandra@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 01:53:09 +0000