Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-25Merge branch 'release/0.8' into release/0.7Michael Niedermayer
* release/0.8: (22 commits) Update Changelog for 0.7.3 release 4xm: Add a check in decode_i_frame to prevent buffer overreads wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. Update RELEASE file for 0.7.3 swscale: #include "libavutil/mathematics.h" vp3dec: Check coefficient index in vp3_dequant() svq1dec: call avcodec_set_dimensions() after dimensions changed. mpegtsenc: fix handling of large audio packets (sorry i have no sample, just a user report) h264: Use mismatching frame numbers in fields swscale: Readd #define _SVID_SOURCE vp6: Fix illegal read. vp6: Fix illegal read. vp6: Reset the internal state when aborting key frames header parsing vp6: Check for huffman tree build errors vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling imgutils: Fix illegal read. qdm2: check output buffer size before decoding Fix out of bound reads in the QDM2 decoder. Check for out of bound writes in the QDM2 decoder. vmd: fix segfaults on corruped streams ... Conflicts: Doxyfile RELEASE VERSION Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-25Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer
* qatar/release/0.7: Update Changelog for 0.7.3 release Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-24Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer
This merge is primary for metadata, theres little actually changed except cosmetics * qatar/release/0.7: 4xm: Add a check in decode_i_frame to prevent buffer overreads wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. Update RELEASE file for 0.7.3 swscale: #include "libavutil/mathematics.h" vp3dec: Check coefficient index in vp3_dequant() svq1dec: call avcodec_set_dimensions() after dimensions changed. swscale: Readd #define _SVID_SOURCE Conflicts: RELEASE libavcodec/4xm.c libavcodec/vp3.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-24Update Changelog for 0.7.3 releaseReinhard Tartler
2011-12-244xm: Add a check in decode_i_frame to prevent buffer overreadsShitiz Garg
Fixes bugzilla #135 Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit 355d917c0bd8163a3f1c7d4a6866dac749efdb84) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-24wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.Justin Ruggles
The initial values are not checked against the number of block sizes. Initializing them to frame_len_bits will result in a block size index of 0 in these cases instead of something that might be out-of-range. Fixes Bug 81. (cherry picked from commit 05d1e45d1f42cc90d1f2f36c546d0096cea126a8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-23Update RELEASE file for 0.7.3Reinhard Tartler
2011-12-23swscale: #include "libavutil/mathematics.h"Reinhard Tartler
this file uses the M_PI macro since 4e74187db2f5db52f88729efc662df9d6bc763e1, so include the correct header directly. Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit 5089ce1b5abe2ecbbfd7235aeb0ad47ba38305c1) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-23vp3dec: Check coefficient index in vp3_dequant()Reinhard Tartler
Based on a patch by Michael Niedermayer <michaelni@gmx.at> Fixes NGS00145, CVE-2011-4352 Found-by: Phillip Langlois Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit 8b94df0f2047e9728cb872adc9e64557b7a5152f) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-23svq1dec: call avcodec_set_dimensions() after dimensions changed.Michael Niedermayer
Fixes NGS00148, CVE-2011-4579 Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6e24b9488e67849a28e64a8056e05f83cf439229) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-09mpegtsenc: fix handling of large audio packetsMichael Niedermayer
(sorry i have no sample, just a user report) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e31c5ebe1146d98d17a5121312c5444432c81904) Conflicts: libavformat/mpegtsenc.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-09mpegtsenc: fix handling of large audio packetsMichael Niedermayer
(sorry i have no sample, just a user report) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e31c5ebe1146d98d17a5121312c5444432c81904) Conflicts: libavformat/mpegtsenc.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer
Note, all these commits where already in our release, this merge thus changes nothing, its just for metadata * qatar/release/0.7: vp6: Fix illegal read. vp6: Fix illegal read. vp6: Reset the internal state when aborting key frames header parsing vp6: Check for huffman tree build errors vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling imgutils: Fix illegal read. qdm2: check output buffer size before decoding Fix out of bound reads in the QDM2 decoder. Check for out of bound writes in the QDM2 decoder. vmd: fix segfaults on corruped streams Conflicts: libavcodec/qdm2.c libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07h264: Use mismatching frame numbers in fieldsMichael Niedermayer
to synchronize the first/second field state independant of them being reference or not. Fixes Ticket354 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 545ec935a4b4e0f032ebd975907b41f6fe4465c9)
2011-12-07h264: Use mismatching frame numbers in fieldsMichael Niedermayer
to synchronize the first/second field state independant of them being reference or not. Fixes Ticket354 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 545ec935a4b4e0f032ebd975907b41f6fe4465c9)
2011-12-06swscale: Readd #define _SVID_SOURCEMartin Storsjö
This was removed erroneously in 046f081b46c8479820409cf8f530b988221bd15b. This define still is necessary for getting MAP_ANONYMOUS defined on linux/glibc, despite the define reshuffling done in that commit. Without MAP_ANONYMOUS defined, the mprotect calls for setting the generated mmx2 scaler code pages executable are left out, causing crashes if that codepath is chosen. This patch fixes scaling from 192x144 to 320x240 with -sws_flags fast_bilinear, which crashes on linux at the moment. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit f32dfad9dc64acf0fd1bb867e127a9efe6380676) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vp6: Fix illegal read.Thierry Foucu
Found with Address Sanitizer Signed-off-by: Alex Converse <alex.converse@gmail.com> (cherry picked from commit e0966eb140b3569b3d6b5b5008961944ef229c06) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vp6: Fix illegal read.Alex Converse
(cherry picked from commit 2a6eb06254df79e96b3d791b6b89b2534ced3119) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vp6: Reset the internal state when aborting key frames header parsingLaurent Aimar
It prevents leaving the state only half initialized. Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit a72cad0a6c05aa74940101e937cb3dc602d7d67b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vp6: Check for huffman tree build errorsLaurent Aimar
Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit 066fff755a5d8edc660c010ddb08474d208eeade) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vp6: partially propagate huffman tree building errors during coeff model ↵Dustin Brody
parsing and fix misspelling Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f913eeea43078b3b9052efd8d8d29e7b29b39208) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04imgutils: Fix illegal read.Thierry Foucu
Found with address sanitizer. Signed-off-by: Alex Converse <alex.converse@gmail.com> (cherry picked from commit c693aa6f71b4f539cf9df67ba42f4b1932981687) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04qdm2: check output buffer size before decodingJustin Ruggles
(cherry picked from commit 7d49f79f1cd47783a963a757a6563b9cac29db62) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04Fix out of bound reads in the QDM2 decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> (cherry picked from commit 5a19acb17ceb71657b0eec51dac651953520e5c8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04Check for out of bound writes in the QDM2 decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> (cherry picked from commit 291d74a46d32183653db07818c7b3407fd50a288) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-04vmd: fix segfaults on corruped streamsLaurent Aimar
Signed-off-by: Janne Grunau <janne-libav@jannau.net> Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-11-24Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.cSergiy Gur'yev
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 32ed7da1350e551ec005b75e482da74f2e93fbb9)
2011-11-24Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.cSergiy Gur'yev
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 32ed7da1350e551ec005b75e482da74f2e93fbb9)
2011-11-21Update for 0.8.7n0.8.7Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21Update for 0.7.8n0.7.8Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21Merge branch 'release/0.8' into release/0.7Michael Niedermayer
* release/0.8: (31 commits) svq1dec: call avcodec_set_dimensions() after dimensions changed. Fixes NGS00148 vp3dec: Check coefficient index in vp3_dequant() Fixes NGS00145 qdm2dec: fix buffer overflow. Fixes NGS00144 h264: Fix invalid interlaced progressive MB combinations for direct mode prediction. Fixes Ticket312 mpegvideo: dont use ff_mspel_motion() for vc1 Fixes Ticket655 imgutils: Fix illegal read. ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3. Our ac3 code chain can handle it fine. More ideal would be to write a demuxer that actually extracts what can be from the additional headers and uses it for whatever it can be used for. mjpeg: support mpo Fixes stereoscopic_photo.mpo Add a version bump and APIchanges entry for avcodec_open2 and avformat_find_stream_info. lavf: fix multiplication overflow in avformat_find_stream_info() lavf: fix invalid reads in avformat_find_stream_info() lavf: add avformat_find_stream_info() lavc: fix parentheses placement in avcodec_open2(). lavc: introduce avcodec_open2() as a replacement for avcodec_open(). rawdec: use a default sample rate if none is specified. Fixes "ffmpeg -f s16le -i /dev/zero" rawdec: add check on sample_rate qdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones() This is neccessary but likely not sufficient to prevent out of array reads. cinepak: check strip_size wma: Check channel number before init. Fixes Ticket240 Do not try to read 16bit gray png files with alpha channel. ... Conflicts: libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21svq1dec: call avcodec_set_dimensions() after dimensions changed.Michael Niedermayer
Fixes NGS00148 Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4931c8f0f10bf8dedcf626104a6b85bfefadc6f2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21vp3dec: Check coefficient index in vp3_dequant()Michael Niedermayer
Fixes NGS00145 Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eef5c35b4352ec49ca41f6198bee8a976b1f81e5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21qdm2dec: fix buffer overflow.Michael Niedermayer
Fixes NGS00144 This also adds a few lines of code from master that are needed for this fix. Thanks to Phillip for suggestions to improve the patch. Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21h264: Fix invalid interlaced progressive MB combinations for direct mode ↵Michael Niedermayer
prediction. Fixes Ticket312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 833a195905405fc9646c7544ce9d0f3279608977) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21mpegvideo: dont use ff_mspel_motion() for vc1Michael Niedermayer
Fixes Ticket655 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 50d6f8195658d529c57bb42dfd8d7a71d60a9f1d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21imgutils: Fix illegal read.Thierry Foucu
Found with address sanitizer. Signed-off-by: Alex Converse <alex.converse@gmail.com> (cherry picked from commit c693aa6f71b4f539cf9df67ba42f4b1932981687) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3.Michael Niedermayer
Our ac3 code chain can handle it fine. More ideal would be to write a demuxer that actually extracts what can be from the additional headers and uses it for whatever it can be used for. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 30ca700ba17b9ba46f4648afa30559ad890f0221) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21mjpeg: support mpoMichael Niedermayer
Fixes stereoscopic_photo.mpo Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1d23e5246c67f765dd5d119c9f3197bdae07330c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer
* qatar/release/0.7: Add a version bump and APIchanges entry for avcodec_open2 and avformat_find_stream_info. lavf: fix multiplication overflow in avformat_find_stream_info() lavf: fix invalid reads in avformat_find_stream_info() lavf: add avformat_find_stream_info() lavc: fix parentheses placement in avcodec_open2(). lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: doc/APIchanges libavcodec/utils.c libavcodec/version.h libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19Add a version bump and APIchanges entry for avcodec_open2 and ↵Anton Khirnov
avformat_find_stream_info.
2011-11-19lavf: fix multiplication overflow in avformat_find_stream_info()Mans Rullgard
Converting to double before the multiplication rather than after avoids an integer overflow in some cases. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 52767d891c665ab1124fe4ce82d99b59673de7d2) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-19lavf: fix invalid reads in avformat_find_stream_info()Anton Khirnov
(cherry picked from commit e358f7ee90fec591348ca05dff94ebaf4c1a098b) Conflicts: libavformat/utils.c Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-19lavf: add avformat_find_stream_info()Anton Khirnov
It supports passing options to codecs. (cherry picked from commit a67c061e0f3b55ffcc96f336fc0998e44b86c8e4) Conflicts: libavformat/utils.c Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-19lavc: fix parentheses placement in avcodec_open2().Baptiste Coudurier
Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 1d36fb13b088f55ece155153fb6ca8ea278fc837) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-19lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov
Adds support for decoder-private options and makes setting other options simpler. (cherry picked from commit 0b950fe240936fa48fd41204bcfd04f35bbf39c3) Conflicts: libavcodec/avcodec.h Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-19rawdec: use a default sample rate if none is specified.Michael Niedermayer
Fixes "ffmpeg -f s16le -i /dev/zero" Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fca85ce5ecc8acba6a5cf10c5f99e932b26c6367) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19rawdec: add check on sample_rateStefano Sabatini
Prevent error condition in case sample_rate is unset or set to a negative value. In particular, fix divide-by-zero error occurring in ffmpeg due to sample_rate set to 0 in output_packet(), in code: ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) / ist->st->codec->sample_rate; Fix trac ticket #324. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19qdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones()Michael Niedermayer
This is neccessary but likely not sufficient to prevent out of array reads. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 14db3af4f26dad8e6ddf2147e96ccc710952ad4d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19cinepak: check strip_sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cea0c82d9b9771dfa2ac729c13c0d9e03ea352a7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 19:25:48 +0300