summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* | Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | | | This commit is a no-op. * commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3': msvc: Fix libx264 linking doc: Improve the channelsplit example configure: Support MSYS2 mingw-w64 64bit Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * msvc: Fix libx264 linkingHenrik Gramner2016-02-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * doc: Improve the channelsplit exampleVicente Jimenez Aguilar2016-02-06
| | | | | | | | | | | | Expand LFE acronym (lfe.wav -> low_frecuency_effects.wav) as with others filenames Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * configure: Support MSYS2 mingw-w64 64bitLuca Barbato2016-02-06
| |
* | Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45': v210: Use separate sample_factors Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * v210: Use separate sample_factorsLuca Barbato2016-02-01
| | | | | | | | | | | | | | The 10bit and the 8bit functions can now be implemented to process a different amount of samples. And while at it simplify a little the code.
* | Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | This commit is a no-op. * commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7': v210: Add avx2 version of the 10-bit line encoder v210: Add avx2 version of the 8-bit line encoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * v210: Add avx2 version of the 10-bit line encoderJames Darnley2016-02-01
| | | | | | | | | | | | Around 25% faster than the ssse3 version. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * v210: Add avx2 version of the 8-bit line encoderJames Darnley2016-02-01
| | | | | | | | | | | | | | Around 35% faster than the avx version. Signed-off-by: Henrik Gramner <henrik@gramner.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038': flacenc: Restore defaults and range for {min, max}_prediction_order Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * flacenc: Restore defaults and range for {min, max}_prediction_orderDerek Buitenhuis2016-02-01
| | | | | | | | | | | | This was broken in 243df1351d2d928caa084a5704ed783f0b83f072. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit '60f0fde3092d18d4d36555962c192af8691a099c': libx264: Make sure to preserve default option values Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * libx264: Make sure to preserve default option valuesVittorio Giovara2016-02-01
| | | | | | | | | | | | | | | | The private options chromaoffset, sc_threshold, and noise_reduction were set to 0 rather than -1, and were always initializing values in libx264 rather than letting the library use its default. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '77a44f577b644a328dcf90cde11d2ecae69eda05'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | This commit is a no-op. * commit '77a44f577b644a328dcf90cde11d2ecae69eda05': configure: add missing avx2 support check x86: Add ymm_reg struct Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * configure: add missing avx2 support checkJames Almer2016-01-28
| | | | | | | | | | | | | | | | AVX2 support was introduced in Yasm 1.2.0 and NASM 2.10, and the oldest versions currently supported are Yasm 0.8.0 and NASM 2.03 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * x86: Add ymm_reg structJames Almer2016-01-28
| | | | | | | | | | | | | | Needed to declare 32-byte long constants Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a': v210: x86: Add the correct guards around the asm code Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * v210: x86: Add the correct guards around the asm codeLuca Barbato2016-01-26
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '4709f72115e4028a1cb43e916925678bfceef870'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | This commit is a no-op. * commit '4709f72115e4028a1cb43e916925678bfceef870': lavfi: Use AV_CEIL_RSHIFT where needed Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavfi: Use AV_CEIL_RSHIFT where neededVittorio Giovara2016-01-25
| |
* | Merge commit 'e80307140f736f593ee643affa015333d7c5e27f'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit 'e80307140f736f593ee643affa015333d7c5e27f': yuv4mpegenc: Use AV_CEIL_RSHIFT where needed Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * yuv4mpegenc: Use AV_CEIL_RSHIFT where neededVittorio Giovara2016-01-25
| |
* | Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '6695f178a5929eab91d3da7e9023999f1774bd0e': pixdesc: Use AV_CEIL_RSHIFT in documentation Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * pixdesc: Use AV_CEIL_RSHIFT in documentationVittorio Giovara2016-01-25
| |
* | Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '1546a41adae818b340acdd9b5dacd6d0a92b6507': pixdesc: Drop unneeded deprecation warning guards Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * pixdesc: Drop unneeded deprecation warning guardsVittorio Giovara2016-01-25
| |
* | Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | * commit '9cac1b4b4f1532fb2aeef54799285360656be5eb': qsvenc: Add private option to replace coder_type Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: Add private option to replace coder_typeVittorio Giovara2016-01-25
| | | | | | | | Missing from be00ec832c519427cd92218abac77dafdc1d5487.
* | Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'Derek Buitenhuis2016-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a no-nop. * commit 'eef9f06508354d1c7d5624c1c18997e7974288f1': avplay: Allow to override the codec avplay: Statically allocate the player state avplay: Rename cur_stream to player avplay: Rename VideoState to PlayerState avplay: Allocate the refresh thread next to the decode thread avplay: Move the stream setup in the main thread Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avplay: Allow to override the codecLuca Barbato2016-01-25
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avplay: Statically allocate the player stateLuca Barbato2016-01-25
| | | | | | | | | | | | And move the resource deallocation in stream_open failure path. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avplay: Rename cur_stream to playerLuca Barbato2016-01-25
| | | | | | | | | | | | The name was misleading. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avplay: Rename VideoState to PlayerStateLuca Barbato2016-01-25
| | | | | | | | | | | | The structure is not video-specific. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avplay: Allocate the refresh thread next to the decode threadLuca Barbato2016-01-25
| | | | | | | | | | | | It does not belong to the stream setup. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avplay: Move the stream setup in the main threadLuca Barbato2016-01-25
| | | | | | | | | | | | | | And refactor the code in preparation of the following patches. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>