| 49fa398 | Michael Niedermayer | 12 August 2014, 03:18:21 UTC | Changelog: add entry for proresenc | 12 August 2014, 03:18:21 UTC |
| 1ad1723 | Christophe Gisquet | 11 August 2014, 22:06:08 UTC | proresenc_kostya: report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 52b81ff4635c077b2bc8b8d3637d933b6629d803) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 12 August 2014, 00:40:23 UTC |
| 7740b11 | Christophe Gisquet | 11 August 2014, 22:06:07 UTC | proresenc_kostya: remove unneeded parameters Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bf10f09bccdcfdb41b9f5bbae01d55961bfd0693) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 12 August 2014, 00:40:19 UTC |
| c0ad5f9 | Michael Niedermayer | 11 August 2014, 18:16:12 UTC | Update for 2.2.7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 18:16:12 UTC |
| bb7f236 | Michael Niedermayer | 11 August 2014, 13:36:22 UTC | avcodec/snow: fix null pointer dereference in cleanup after allocation failure Fixes: snowf.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9a162146ca6cc12ef7ad4a15164349482885962c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 17:07:11 UTC |
| 0397d43 | Michael Niedermayer | 10 August 2014, 19:59:33 UTC | avcodec/iff: check pixfmt for rgb8 / rgbn Fixes out of array access Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 17:07:11 UTC |
| ffc66ac | Michael Niedermayer | 06 August 2014, 11:59:18 UTC | avutil/cpu: add aarch64 entries to 2nd table Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit efc4fe9d74a5040e465dbff80b29468dbc227c19) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 17:07:11 UTC |
| 588e722 | Michael Niedermayer | 02 August 2014, 01:29:42 UTC | ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec Fixes part of ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 956f4087c6eb717e31f3b92fe03fd56a3747eccf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:59:43 UTC |
| 0dc5868 | Michael Niedermayer | 11 August 2014, 16:51:22 UTC | Merge commit '67134ad31f1f3bc1515eae129e4368401f7c3342' into release/2.2 * commit '67134ad31f1f3bc1515eae129e4368401f7c3342': h264: fix interpretation of interleaved stereo modes Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:51:29 UTC |
| 723512a | Michael Niedermayer | 07 August 2014, 00:27:07 UTC | avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet" Add padding, clear size, use the correct pointer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4213fc5b9eebec53c7d22b770c3f1ceecca1c113) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:50:29 UTC |
| 963514e | Michael Niedermayer | 11 August 2014, 16:50:11 UTC | Merge commit 'd513c6a0ee582d22b6e793286774abbde01f6680' into release/2.2 * commit 'd513c6a0ee582d22b6e793286774abbde01f6680': svq1: do not modify the input packet Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:50:11 UTC |
| c11b301 | Michael Niedermayer | 11 August 2014, 16:49:37 UTC | Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2 * commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef': cdgraphics: do not return 0 from the decode function Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:49:37 UTC |
| 3301b24 | Michael Niedermayer | 11 August 2014, 16:40:48 UTC | Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2 * commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250': cdgraphics: switch to bytestream2 Conflicts: libavcodec/cdgraphics.c See: ad002e1a13a8df934bd6cb2c84175a4780ab8942 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:41:07 UTC |
| 7b67ce9 | Michael Niedermayer | 11 August 2014, 16:40:00 UTC | Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2 * commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba': jpeg2000: enable 4 component pixel formats See: f0358dc1d30cd4f4862489ab95c4d408b00a8b0d Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:40:20 UTC |
| 90a1c5e | Michael Niedermayer | 11 August 2014, 16:36:21 UTC | Merge commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70' into release/2.2 * commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70': stereo3d: add missing include guards Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:38:27 UTC |
| 45a529d | Michael Niedermayer | 11 August 2014, 16:02:19 UTC | Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2 * commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94': huffyuvdec: check width size for yuv422p Conflicts: libavcodec/huffyuvdec.c See: 6abb9a901fca27da14d4fffbb01948288b5da3ba Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:02:36 UTC |
| 97cbad3 | Michael Niedermayer | 11 August 2014, 16:01:29 UTC | Merge commit 'bea14966e2a37019cb4e38420868c5bb0542d487' into release/2.2 * commit 'bea14966e2a37019cb4e38420868c5bb0542d487': mmvideo: check horizontal coordinate too See: 8d3c99e825317b7efda5fd12e69896b47c700303 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:01:44 UTC |
| 6419569 | Michael Niedermayer | 11 August 2014, 16:00:51 UTC | Merge commit '6be5a3c0451e8f199ef1da09961aa76c08c87afd' into release/2.2 * commit '6be5a3c0451e8f199ef1da09961aa76c08c87afd': wmalosslessdec: fix mclms_coeffs* array size See: ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 August 2014, 16:01:05 UTC |
| 67134ad | Felix Abecassis | 07 August 2014, 09:42:36 UTC | h264: fix interpretation of interleaved stereo modes Column and row frame packing arrangements were inverted. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> | 07 August 2014, 10:40:08 UTC |
| d513c6a | Anton Khirnov | 03 August 2014, 08:14:48 UTC | svq1: do not modify the input packet The input data must remain constant, make a copy instead. This is in theory a performance hit, but since I failed to find any samples using this feature, this should not matter in practice. Also, check the size of the header, avoiding invalid reads on truncated data. CC:libav-stable@libav.org (cherry picked from commit 7b588bb691644e1b3c168b99accf74248a24e3cf) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 06 August 2014, 19:05:34 UTC |
| 18f48e0 | Anton Khirnov | 06 August 2014, 10:56:34 UTC | cdgraphics: do not return 0 from the decode function 0 means no data consumed, so it can trigger an infinite loop in the caller. CC:libav-stable@libav.org (cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 06 August 2014, 18:41:44 UTC |
| 5bf5a35 | Anton Khirnov | 06 August 2014, 10:46:50 UTC | cdgraphics: switch to bytestream2 Fixes possible invalid memory accesses on corrupted data. CC:libav-stable@libav.org Bug-ID: CVE-2013-3674 (cherry picked from commit a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 06 August 2014, 18:41:42 UTC |
| 6598aae | Vittorio Giovara | 06 August 2014, 10:07:08 UTC | jpeg2000: enable 4 component pixel formats Bug-Id: 721 CC: libav-stable@libav.org Sample-Id: 31230.mov | 06 August 2014, 11:44:35 UTC |
| a5992a2 | Vittorio Giovara | 21 April 2014, 00:33:35 UTC | stereo3d: add missing include guards | 06 August 2014, 11:44:35 UTC |
| 1b99667 | Michael Niedermayer | 05 August 2014, 20:26:28 UTC | Changelog: fix typo Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 20:27:53 UTC |
| 1f4d779 | Michael Niedermayer | 28 July 2014, 00:40:35 UTC | version.sh: Print versions based on the last git tag for release branches release branches are detected by checking if "git" is not in RELEASE This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb" for git master theres no change This should improve the readability of lists of versions which come from more than 1 release branch or master + release. fate.ffmpeg.org is one possible example Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 20:18:00 UTC |
| f543d32 | Michael Niedermayer | 28 July 2014, 00:22:11 UTC | remove VERSION file it overrides what version.sh prints and thus makes its output from release branches rather useless Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038) Conflicts: VERSION | 05 August 2014, 20:16:42 UTC |
| 2cbdbc3 | Michael Niedermayer | 05 August 2014, 10:31:18 UTC | update for 2.2.6 Changelog by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 20:07:12 UTC |
| aa943bd | Michael Niedermayer | 02 August 2014, 23:54:33 UTC | huffyuvdec: check width size for yuv422p Avoid out of array accesses. CC: libav-stable@libav.org Bug-Id: CVE-2013-0848 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit a7153444df9040bf6ae103e0bbf6104b66f974cb) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 05 August 2014, 20:06:53 UTC |
| bea1496 | Michael Niedermayer | 03 August 2014, 18:24:18 UTC | mmvideo: check horizontal coordinate too Fixes out of array accesses. Bug-Id: CVE-2013-3672 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 70cd3b8e659c3522eea5c16a65d14b8658894a94) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 05 August 2014, 19:21:40 UTC |
| 6be5a3c | Michael Niedermayer | 07 February 2014, 14:07:23 UTC | wmalosslessdec: fix mclms_coeffs* array size Fixes corruption of context Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Bug-Id: CVE-2014-2098 Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 849b9d34c7ef70b370c53e7af3940f51cbc07d0f) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 05 August 2014, 14:59:29 UTC |
| 119131f | Michael Niedermayer | 02 August 2014, 12:03:30 UTC | ffserver: initialize pbuffer in prepare_sdp_description() also check pbuffer before use Found-by: CSA Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1d8d21b90ab91aa471f369e0f9d1ea20fb40733b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:45:56 UTC |
| c13e38b | Michael Niedermayer | 02 August 2014, 16:15:12 UTC | avcodec/wavpackenc: Fix log2sample() result value Found-by: CSA Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e706fe764049b3f1ccf10ba9f686426a4c007906) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:45:56 UTC |
| 01c4fe7 | Michael Niedermayer | 02 August 2014, 20:30:03 UTC | avformat/tee: flip assigment direction Found-by: CSA Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2e6fdcb7f3c86491408a3699f0aa9dc52b7c5686) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:45:56 UTC |
| ad13a5c | Michael Niedermayer | 01 August 2014, 23:16:14 UTC | avcodec/dvdsub_parser: print message if packet is smaller than the packet size field Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bcc898dd2643c883522ffa565be4b226ce798c78) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| ce248bf | Michael Niedermayer | 01 August 2014, 23:15:37 UTC | avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81c1657a593b1c0f8e46fca00ead1d30ee1cd418) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| 8eaefbe | Michael Niedermayer | 01 August 2014, 22:27:23 UTC | avcodec/dvdsub_parser: never return 0 when the input isnt 0 Fixes a infinite loop Fixes Ticket3804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cfdb30d2f1241de9354a8efdbf8252d0f1a6f933) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| 81d8bad | Michael Niedermayer | 01 August 2014, 19:10:43 UTC | avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice Fixes Ticket3809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f95298c913899207344d668a6d5624cb2d2e480c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| 0aee436 | Anshul Maheswhwari | 31 July 2014, 15:29:59 UTC | v4l2enc: adding AVClass Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fcb11ec291e9b3e3f352fa4d3e9026c0f7f64aa8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| cdaf9fb | Michael Niedermayer | 31 July 2014, 14:25:21 UTC | libavcodec/h264_parser: Increase parse_history, fix huge resolutions Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0782fb6bcb32fe3ab956a99af4cc472ff81da0c2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| cf41ff4 | Benoit Fouet | 31 July 2014, 13:32:14 UTC | h264_mp4toannexb_bsf: account for consecutive IDR pictures. If there are consecutive IDR pictures, then SPS/PPS should be prepended to all of them, not only the first one. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bf428bb3145c4f0eef32f8ef00de0ee222b3e414) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| 6120ad3 | Chris \"Koying\" Browet | 26 July 2014, 07:15:57 UTC | avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream (cherry picked from commit ad91bf854b559f1afc42fc06f8a7dfbb75def5c8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:14:02 UTC |
| 2105f04 | Michael Niedermayer | 17 July 2014, 02:25:21 UTC | avformat/dv: implement fallback in dv_extract_pack() Fixes Ticket2340 Fixes Ticket2341 Based-on mail from Dave Rice <dave@dericed.com> Tested-by: Dave Rice <dave@dericed.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 88f038ac97a875f25c2eceac6d2107a09314984c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| 815d322 | Michael Niedermayer | 15 July 2014, 19:43:30 UTC | avcodec/hevc: treat current_sps like sps_list This simplifies the management of current_sps Fixes Ticket3458 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 880dbe43ca71982ecdfe1c73446137d6b2fd24d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| 51dd23c | Michael Niedermayer | 15 July 2014, 19:43:04 UTC | avcodec/hevc_ps: prevent stale pointer in malloc failure case Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0fc2045d5f4eab35d943a79c3d965a2f31361f48) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| a4e1532 | Michael Niedermayer | 12 July 2014, 04:36:25 UTC | avcodec/hevc_ps: do not loose all reference to pointers still in use Fixes leaving a pointer to unreferenced memory Fixes Ticket 3115 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ccd6911c189d2f974dcc4095c963dfad14d703d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| f7b1475 | Nicolas George | 18 July 2014, 08:34:39 UTC | ffmpeg_filter: refuse to configure input without a decoder. The decoder is necessary in order to filter frames. This makes the error message clearer in this case: currently, it will usually fail because the pixel or sample format is not defined and is converted into "(null)" (non-portable). Enhance trac ticket #3779. (cherry picked from commit 91244073fd8b983e7cd1f97da83daf956fbbddc6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| f99b17b | Michael Niedermayer | 30 July 2014, 15:50:35 UTC | avfilter/f_select: avoid double->int in debug output Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6f622e5fcbe8484af194436b8dd4ff01f092ab99) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| 21f6b07 | Michael Niedermayer | 30 July 2014, 15:48:33 UTC | avfilter/f_select: Set var_values[VAR_KEY] correctly Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bcbfb95b0e327679337eaca59c247a2580ea4105) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| c9f1456 | Michael Niedermayer | 30 July 2014, 15:37:09 UTC | avfilter/f_select: avoid using doubles for equals checks and casts to enums This might silence some warnings. Issue found from: a8d803a320fb08b3ad5db4fffc79abd401206905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 887d8d293fc31c949427f971f37c126b3812b451) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:13:38 UTC |
| 77b789b | Michael Niedermayer | 05 August 2014, 02:05:48 UTC | Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2 * commit '07015d9f913d63bdc4495e75f4603c586553796e': Update Changelog for v10.3 Conflicts: Changelog Not merged as it does not match our release Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:05:48 UTC |
| 9ed1aa0 | Michael Niedermayer | 05 August 2014, 02:04:01 UTC | Merge commit '744b406ff3474e77543bcf86125a2f7bc7deaa18' into release/2.2 * commit '744b406ff3474e77543bcf86125a2f7bc7deaa18': huffyuv: Check and propagate function return values Conflicts: libavcodec/huffyuvdec.c See: f67a0d115254461649470452058fa3c28c0df294 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 02:04:01 UTC |
| 188ce94 | Michael Niedermayer | 05 August 2014, 01:55:01 UTC | Merge commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b' into release/2.2 * commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b': h264: prevent theoretical infinite loop in SEI parsing Conflicts: libavcodec/h264_sei.c See: 9decfc17bb76da34734296048d390b176abf404c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 01:55:15 UTC |
| 7fc9c7c | Michael Niedermayer | 05 August 2014, 01:52:49 UTC | Merge commit 'a1f7844a11010d8552c75424d1a831b37a0ae5d9' into release/2.2 * commit 'a1f7844a11010d8552c75424d1a831b37a0ae5d9': pgssubdec: Check RLE size before copying See: c0d68be555f5858703383040e04fcd6529777061 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 01:54:50 UTC |
| 07015d9 | Reinhard Tartler | 04 August 2014, 01:30:32 UTC | Update Changelog for v10.3 | 04 August 2014, 01:30:46 UTC |
| 744b406 | Diego Biurrun | 03 August 2014, 19:19:10 UTC | huffyuv: Check and propagate function return values Bug-Id: CVE-2013-0868 inspired by a patch from Michael Niedermayer <michaelni@gmx.at> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Diego Biurrun <diego@biurrun.de> CC: libav-stable@libav.org (cherry picked from commit d0393d79bc3d61c9f2ff832c0e273b7774ff0269) Signed-off-by: Diego Biurrun <diego@biurrun.de> Conflicts: libavcodec/huffyuvdec.c | 03 August 2014, 22:53:38 UTC |
| 2273e5e | Vittorio Giovara | 30 July 2014, 18:33:36 UTC | h264: prevent theoretical infinite loop in SEI parsing Properly address CVE-2011-3946 and parse bitstream as described in the spec. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind | 01 August 2014, 12:15:07 UTC |
| a1f7844 | Michael Niedermayer | 31 July 2014, 01:31:19 UTC | pgssubdec: Check RLE size before copying Make sure the buffer size does not exceed the expected RLE size. Prevent an out of array bound write. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Bug-Id: CVE-2013-0852 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit d98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d) Signed-off-by: Diego Biurrun <diego@biurrun.de> | 01 August 2014, 08:04:13 UTC |
| 3ef8b43 | Michael Niedermayer | 30 July 2014, 18:35:23 UTC | Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2 * commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c tests/fate/fft.mak Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:35:23 UTC |
| 9dc112e | Michael Niedermayer | 30 July 2014, 18:34:13 UTC | Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2 * commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf': video4linux2: Avoid a floating point exception Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:34:13 UTC |
| 75ff0e8 | Michael Niedermayer | 30 July 2014, 18:33:24 UTC | Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2 * commit '01a550bda29eb05fb230576e5223034974aa3396': vf_select: Drop a debug av_log with an unchecked double to enum conversion Conflicts: libavfilter/f_select.c See: 7994c1cd760838ca5b92401caa1994bc035d08b5 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:33:48 UTC |
| f02221d | Michael Niedermayer | 30 July 2014, 18:29:30 UTC | Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2 * commit 'f6b3dce952d66f87883a50d90d6e98416ee397df': librtmp: Don't free the temp url at the end of rtmp_open Conflicts: libavformat/librtmp.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:32:53 UTC |
| 92c4973 | Michael Niedermayer | 30 July 2014, 18:18:14 UTC | Merge commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b' into release/2.2 * commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b': arm: Avoid using the 'setend' instruction on ARMv7 and newer Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:18:14 UTC |
| f4e0869 | Michael Niedermayer | 30 July 2014, 18:14:09 UTC | Merge commit '407912d17870a53e8a8cc072f192cadf358bc155' into release/2.2 * commit '407912d17870a53e8a8cc072f192cadf358bc155': avplay: Handle pixel aspect ratio properly See: 32fdfdfbdac64c57b12910521af1379a24d01f73 See: 99b01e458c268cf18ac0981e644e0f835957498a See: 825ec16da955fd9c726d8e6c846cf9257a781a87 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:14:33 UTC |
| 6135baa | Michael Niedermayer | 30 July 2014, 18:12:45 UTC | Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2 * commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a': Prepare for 10.3 Release Conflicts: RELEASE Not merged, as FFmpeg has different version numbers Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 18:13:20 UTC |
| 3573256 | Michael Niedermayer | 30 July 2014, 17:59:38 UTC | Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2 * commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47': eamad: use the bytestream2 API instead of AV_RL Conflicts: libavcodec/eamad.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 30 July 2014, 17:59:38 UTC |
| 01a550b | Diego Biurrun | 29 July 2014, 12:43:04 UTC | vf_select: Drop a debug av_log with an unchecked double to enum conversion CC: libav-stable@libav.org (cherry picked from commit a8d803a320fb08b3ad5db4fffc79abd401206905) Signed-off-by: Diego Biurrun <diego@biurrun.de> | 30 July 2014, 17:12:17 UTC |
| b20a8ad | Bernhard Übelacker | 27 July 2014, 15:38:59 UTC | video4linux2: Avoid a floating point exception This avoids a segfault in avconv_opt.c:opt_target when trying to determine the norm. (cherry picked from commit dc71f1958846bb1d96de43a4603983dc8450cfcc) Signed-off-by: Diego Biurrun <diego@biurrun.de> | 30 July 2014, 17:12:17 UTC |
| d396987 | Diego Biurrun | 26 June 2014, 00:09:13 UTC | fate: Add dependencies for dct/fft/mdct/rdft tests (cherry picked from commit 24f45c16224d4c5d482e928676714766ffdda4fc) Signed-off-by: Diego Biurrun <diego@biurrun.de> | 30 July 2014, 17:12:17 UTC |
| 12bbd81 | Reinhard Tartler | 27 July 2014, 14:14:04 UTC | Prepare for 10.3 Release | 27 July 2014, 14:14:33 UTC |
| 407912d | Martin Storsjö | 06 July 2014, 20:18:27 UTC | avplay: Handle pixel aspect ratio properly This was broken (left half-implemented) in 354468fc12. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit cf280ed004b5c618560f8f43d14ff264bd1e4c3d) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 27 July 2014, 14:14:33 UTC |
| b8e5711 | Martin Storsjö | 04 July 2014, 15:21:50 UTC | arm: Avoid using the 'setend' instruction on ARMv7 and newer This instruction is deprecated on ARMv8, and it is serializing on some ARMv7 cores as well [1]. [1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293 CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 79fce1ec8abd017593c003917fc123f7119a78d6) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 27 July 2014, 14:14:33 UTC |
| f6b3dce | Martin Storsjö | 04 July 2014, 19:13:39 UTC | librtmp: Don't free the temp url at the end of rtmp_open librtmp can keep pointers to this string internally, and may use them at shutdown as well. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 865461099e062de5a3a109c2a5be98004c11d8bd) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavformat/librtmp.c | 27 July 2014, 14:14:33 UTC |
| f9204ec | Anton Khirnov | 20 July 2014, 12:06:47 UTC | eamad: use the bytestream2 API instead of AV_RL This is safer and possibly fixes invalid reads on truncated data. (cherry-picked from commit 541427ab4d5b4b6f5a90a687a06decdb78e7bc3c) CC:libav-stable@libav.org Conflicts: libavcodec/eamad.c | 27 July 2014, 13:59:01 UTC |
| 4ddac71 | Alessandro Ghedini | 21 April 2014, 17:10:52 UTC | vc1: Do not return an error when skipping b frames This caused mpv (and possibly others) to fallback to software decoding after seeking a VC1 stream. Bug-Id: 667 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit cdf6eb5a9710566be217a3f17d3d94ac4e4d2662) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 July 2014, 08:42:35 UTC |
| 3e78f86 | Michael Niedermayer | 23 July 2014, 08:42:11 UTC | Merge commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14' into release/2.2 * commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14': g2meet: allow size changes within original sizes Merged-by: Michael Niedermayer <michaelni@gmx.at> | 23 July 2014, 08:42:11 UTC |
| 68fd80e | Vittorio Giovara | 15 July 2014, 19:22:11 UTC | g2meet: allow size changes within original sizes | 16 July 2014, 00:10:21 UTC |
| 0edc799 | James Almer | 09 June 2014, 01:21:30 UTC | x86/scale: fix xmm register count for hscale*_sse2 xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 345f2234d1717d6128b2f90a7839c4906bf203ec) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 July 2014, 00:14:55 UTC |
| 3cf6135 | Michael Niedermayer | 15 July 2014, 00:01:06 UTC | Update for FFmpeg 2.2.5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 July 2014, 00:01:06 UTC |
| 160e91d | Michael Niedermayer | 14 July 2014, 19:06:58 UTC | ffmpeg: Use av_stream_get_parser() to avoid ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8bbadc9b6ec71abbd9dab854c47027b949997af0) Conflicts: ffmpeg.c | 14 July 2014, 21:26:06 UTC |
| 9f8e3e6 | Michael Niedermayer | 14 July 2014, 19:03:43 UTC | avformat: add av_stream_get_parser() to access avformat AVParser The AVStream.parser field is considered private and its location cannot be preserved while preserving also ABI compatibility to libav, as libav added fields before it. Some tools like ffmpeg.c access this field though Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 62227a70f0a4c07d7ead5775d8bad64797f8ef80) Conflicts: RELEASE_NOTES doc/APIchanges libavformat/utils.c libavformat/version.h | 14 July 2014, 21:26:06 UTC |
| 9752ab6 | Michael Niedermayer | 12 July 2014, 23:07:59 UTC | avformat/utils: do not wait for packets from discarded streams for genpts Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8202c49b43621c04e26d4a3aa83a10e1e5cc1836) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:26:06 UTC |
| 64e069e | Michael Niedermayer | 01 July 2014, 01:50:53 UTC | avfilter/f_ebur128: Use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a97137e9486964918a71f1a760cdcc297bf61b59) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:04:44 UTC |
| e064cce | Michael Niedermayer | 01 July 2014, 01:50:17 UTC | avcodec/hevc: Use av_malloc(z)_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7faa7d3d42af12a60a4db7ecba165369ec5795d7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:04:44 UTC |
| b8102ce | Michael Niedermayer | 01 July 2014, 01:49:36 UTC | cmdutils_opencl: Use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 80da227c660e7bef7400f602a9817a897f07022b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:04:44 UTC |
| f38c42b | Michael Niedermayer | 25 June 2014, 16:10:12 UTC | avfilter/x86/vf_pullup: fix old typo This makes C and MMX match, no change to fate as the differences where apparently not sufficient to show up in fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b8255a4c7096ecddea68e12e067c7a9b2e14ed8d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:04:44 UTC |
| a770a61 | Michael Niedermayer | 25 June 2014, 15:49:03 UTC | avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions This should avoid issues on x86_64 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6dffc8f5aaab6b20385f0a0d9ef95cec7d6cdd4b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 21:04:43 UTC |
| b2111ad | Michael Niedermayer | 14 July 2014, 20:58:28 UTC | Merge commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00' into release/2.2 * commit '95e91aaf335dd9c26a9101c38d4926e5271e7e00': af_compand: make sure request_frame always outputs at least one frame See: 6b68e2a43b3407522080be50a2a19cff2f9715ef Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:58:44 UTC |
| 7c81afd | Michael Niedermayer | 14 July 2014, 20:57:48 UTC | Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2 * commit '40dd29653ab85812d21fa64e9a665ceb316701ad': Prepare for 10.2 Release Update Changelog for v10.2 Conflicts: Changelog RELEASE Not merged as these dont align with our releases Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:57:48 UTC |
| 65b839e | Michael Niedermayer | 14 July 2014, 20:48:15 UTC | Merge commit '564c023eba807b162527b17af40424de275fc795' into release/2.2 * commit '564c023eba807b162527b17af40424de275fc795': adpcm: Write the proper predictor in trellis mode in IMA QT See: fa8f060b75bf9074792a0f9ff4ed002652ef62b8 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:48:29 UTC |
| d47e960 | Michael Niedermayer | 14 July 2014, 20:46:00 UTC | Merge commit '771564945aa9aebe2f30192b925fcf4909225eca' into release/2.2 * commit '771564945aa9aebe2f30192b925fcf4909225eca': adpcm: Avoid reading out of bounds in the IMA QT trellis encoder See: a32765c4252eb106a2ade543026ef6f59e699bfa Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:46:48 UTC |
| 0bbd46c | Michael Niedermayer | 14 July 2014, 20:40:16 UTC | Merge commit '16f7cbef5610a878317596134607d2a89da66ecf' into release/2.2 * commit '16f7cbef5610a878317596134607d2a89da66ecf': oggenc: Set the right AVOption size for the pref_duration option See: 536baf6cc5d1db789c9f903776dccb7a41b62a6e Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:40:29 UTC |
| 5f1f186 | Michael Niedermayer | 14 July 2014, 20:39:25 UTC | Merge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2 * commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92': avpacket: fix copying side data in av_packet_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:39:25 UTC |
| ebf3811 | Michael Niedermayer | 14 July 2014, 20:37:59 UTC | Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2 * commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957': jpeg2000: fix dereferencing invalid pointers during cleanup Conflicts: libavcodec/jpeg2000.c See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f See: 912ce9dd2080c5837285a471d750fa311e09b555 See: 9e477a37703318cb86d8ed1d426929235aa02b67 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:38:22 UTC |
| 0d90143 | Michael Niedermayer | 14 July 2014, 20:26:06 UTC | Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2 * commit '46c477c2a14b04a63ab11d31003b48fab6146a96': Check mp3 header before calling avpriv_mpegaudio_decode_header(). Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:26:06 UTC |
| 00049f1 | Michael Niedermayer | 14 July 2014, 20:25:23 UTC | Merge commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e' into release/2.2 * commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e': Check if an mp3 header is using a reserved sample rate. Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:25:23 UTC |
| d832020 | Michael Niedermayer | 14 July 2014, 20:23:26 UTC | Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2 * commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21': lzo: Handle integer overflow Conflicts: libavutil/lzo.c This is basically not merging changes due to this being fixed differently in FFmpeg See: d6af26c55c1ea30f85a7d9edbc373f53be1743ee See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2014, 20:24:36 UTC |
| 95e91aa | Andrew Kelley | 06 July 2014, 05:24:43 UTC | af_compand: make sure request_frame always outputs at least one frame This fixes a segmentation fault because request_frame in fifo.c assumes that the call to ff_request_frame will populate fifo->root.next. Before, it was possible for request_frame in af_compand to not do this, resulting in a null pointer access. Now, request_frame in af_compand always will return at least one frame or an error, as per the API specifications in avfilter.h for request_frame. Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit d3cfd7aff86ee3d449ca68aba21d67b9b2136a9b) Signed-off-by: Anton Khirnov <anton@khirnov.net> | 08 July 2014, 17:40:07 UTC |
| 40dd296 | Reinhard Tartler | 27 June 2014, 01:14:55 UTC | Prepare for 10.2 Release | 27 June 2014, 01:14:55 UTC |
| 52dd1a9 | Reinhard Tartler | 27 June 2014, 01:11:20 UTC | Update Changelog for v10.2 | 27 June 2014, 01:11:20 UTC |
