[FFmpeg-cvslog] New commits on branch oldabi
Git System
git at videolan.org
Wed Nov 9 02:05:06 CET 2011
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57bf0d1fe53bd501cd2c060075ee9ba27a770bcd
Merge: 661e081 3970d4e
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Nov 9 00:54:58 2011 +0100
Merge branch 'release/0.7' into oldabi
* release/0.7: (290 commits)
nuv: Fix combination of size changes and LZO compression.
av_lzo1x_decode: properly handle negative buffer length.
Do not call parse_keyframes_index with NULL stream.
update versions for 0.7 branch
Version numbers for 0.8.6
snow: emu edge support Fixes Ticket592
imc: validate channel count
imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263)
libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b1309293bbf30edef767503875277b01cf)
configure: fix arch x86_32
mp3enc: avoid truncating id3v1 tags by one byte
asfdec: Check packet_replic_size earlier
cin audio: validate the channel count
binkaudio: add some buffer overread checks.
atrac1: validate number of channels (cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872)
atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e)
vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
apedec: set s->currentframeblocks after validating nblocks
apedec: use unsigned int for 'nblocks' and make sure that it's within int range
apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)
...
Conflicts:
Changelog
Makefile
RELEASE
configure
libavcodec/error_resilience.c
libavcodec/mpegvideo.c
libavformat/matroskaenc.c
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3970d4e72809d9c9bf4c463ba1a6ab2650e3252b
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sat Nov 5 22:34:09 2011 +0100
nuv: Fix combination of size changes and LZO compression.
There were multiple issues, for example might we have to re-run
the decompression when the size of the buffer increased,
we should always use a decompression buffer large enough for
the header (so we do not get stuck when the size is too small).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80a173a33b8abe961397834843881d90a1ddb2a7
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sat Nov 5 21:45:31 2011 +0100
av_lzo1x_decode: properly handle negative buffer length.
Treating them like 0 is safest, current code would invoke
undefined pointer arithmetic behaviour in this case.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
(cherry picked from commit b9242fd12f4be4a79e31fd0aa125ab8a48226896)
(cherry picked from commit 0411b1928965050a940155984a16ad82fe462fc1)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d484a07f1cb2fd416dd4e733ee793a1603c507bf
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Wed Oct 19 18:41:02 2011 +0200
Do not call parse_keyframes_index with NULL stream.
Seems to fix trac issue #569.
Sample is unfortunately not available, but it might be caused by
an index existing for non-existing audio stream (?).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
(cherry picked from commit 6ea6ff053af2aff8a9a898292f9640efa9290c9f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8045254bacca54bc5bb242f43b72564037b8a50d
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Nov 4 22:05:34 2011 +0100
update versions for 0.7 branch
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e17543491dd6db043090f9edfc2ad8677fde868
Merge: 7275dc2 1e1015f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Nov 4 20:20:37 2011 +0100
Merge branch 'release/0.8' into release/0.7
* release/0.8: (96 commits)
Version numbers for 0.8.6
snow: emu edge support Fixes Ticket592
imc: validate channel count
imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263)
libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b1309293bbf30edef767503875277b01cf)
configure: fix arch x86_32
mp3enc: avoid truncating id3v1 tags by one byte
asfdec: Check packet_replic_size earlier
cin audio: validate the channel count
binkaudio: add some buffer overread checks.
atrac1: validate number of channels (cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872)
atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e)
vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
apedec: set s->currentframeblocks after validating nblocks
apedec: use unsigned int for 'nblocks' and make sure that it's within int range
apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)
apedec: check for filter buffer allocation failure (cherry picked from commit 7500781313d11b37772c05a28da20fbc112db478)
mpegaudiodec: check output data size based on avctx->frame_size
resample: Fix array size
resample2: fix potential overflow
...
Conflicts:
Doxyfile
RELEASE
VERSION
Merged-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e1015fd223ff33a88585db13047ce766369c21b
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Nov 4 13:37:27 2011 +0100
Version numbers for 0.8.6
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4a34f402528502a857e134a670421048c388c93
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Oct 26 15:47:14 2011 +0200
snow: emu edge support
Fixes Ticket592
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4416931fc069332e267ab6df037a1227c051d7b1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cba03dc66730cab43a4257bc027d35f09c393f62
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Oct 28 18:31:21 2011 -0400
imc: validate channel count
ask for a sample if not mono
(cherry picked from commit 7b7f47e73356d113cace74b922eee0b6ff5ffe0b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a3f494466afb9eb9c20e69fa92dfdbae386573a
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Oct 28 18:25:49 2011 -0400
imc: check for ff_fft_init() failure
(cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=112431705d82eea875635641185a8aee27bcd86e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Oct 28 00:52:36 2011 -0400
libgsmdec: check output buffer size before decoding
(cherry picked from commit b03761b1309293bbf30edef767503875277b01cf)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=864581fea3afb40f1d40cee000da30be54ec049d
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Nov 1 14:46:18 2011 +0100
configure: fix arch x86_32
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 078811d9e484892e3ad49819148fe6ae65a1954b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8acee792f9d3b2c271d480e4d72ff7e558e0c66
Author: Tobias Rapp <t.rapp at noa-audio.com>
Date: Mon Oct 31 15:11:37 2011 +0100
mp3enc: avoid truncating id3v1 tags by one byte
Avoid writing the trailing null-byte for id3v1 tags if length reaches max length.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0f39fa0279e12c7a174d1da9294bffd95cb15c4c)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e3dec6b08b16307c2bc276d1b4f8b96ab52414e
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Oct 31 22:42:45 2011 +0100
asfdec: Check packet_replic_size earlier
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 60fcc19bff49e0b1972eae014afc087afd94a415)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=711e6c947b728b23e84f15152fa59ef8ae20de63
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Thu Oct 27 13:33:57 2011 -0400
cin audio: validate the channel count
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8491677ab632f89f31bb26e48c8d1c429be07928
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Oct 25 13:47:50 2011 -0400
binkaudio: add some buffer overread checks.
This stops decoding before overreads instead of after.
(cherry picked from commit 101ef19ef4dc9f5c3d536aee8fcc10fff2af4d9e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f98bb0d3ec73b047121bcdf172cc809ac3c47013
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Oct 14 00:24:50 2011 -0400
atrac1: validate number of channels
(cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=346e089d25ba5f1f7509a7fbff6843471b7ccf6b
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Oct 14 00:16:31 2011 -0400
atrac1: check output buffer size before decoding
(cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ac6777a34f4e53b36dc6665826f94798d1e195f
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Fri Oct 28 23:50:04 2011 -0700
vp3: fix oob read for negative tokens and memleaks on error.
(cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae2d3d6be01a520b1b3f71510359a99c82631751
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Oct 11 13:25:27 2011 -0400
apedec: set s->currentframeblocks after validating nblocks
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=998fc04bcfeeaa2b0885ee84e37bcd345797981a
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Oct 11 13:17:44 2011 -0400
apedec: use unsigned int for 'nblocks' and make sure that it's within int range
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43fa5bf55ed5e1a26fff6d0cd434fb911250ee9a
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Oct 11 12:47:11 2011 -0400
apedec: check for data buffer realloc failure
(cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f19b8d95335a9fb616c7c1d806d3dd3abda031c9
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Oct 11 11:47:15 2011 -0400
apedec: check for filter buffer allocation failure
(cherry picked from commit 7500781313d11b37772c05a28da20fbc112db478)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a66fe21073e87079720b961c209ea55fc9234a3
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Sep 27 14:27:43 2011 -0400
mpegaudiodec: check output data size based on avctx->frame_size
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edf3c5a3ebeee8df55c6a05f88a682091f10a364
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 27 15:26:45 2011 +0200
resample: Fix array size
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3e7db0a9ee758bf0570a141be1fea64f8d9c03db)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a39b5e8b323785695fb0e3c0f30bd9e24287db87
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 27 14:34:45 2011 +0200
resample2: fix potential overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ae93d030476ddd7fa2ab4d9d2dd25df85725390
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 27 14:31:53 2011 +0200
resample: Fix overflow
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=241f15f1c93f5bd661a187e42644220fd89ea7de
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Sep 23 19:22:06 2011 -0400
tta: check for extradata allocation failure in tta demuxer
(cherry picked from commit f540ca22c5fb4504d959c295f55591a9ec2a8859)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2137d99086b36b95f589ec19ab3f906d32d31b4a
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Sep 23 19:56:58 2011 -0400
vorbisdec: check output buffer size before writing output
(cherry picked from commit 60aa1a358d9c1c8f891e72246d5dcd897857eca8)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9de2d98a904aa6f13fd07cb776850569e110f22
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Sep 23 19:50:41 2011 -0400
twinvq: check output buffer size before decoding
(cherry picked from commit e53eecd0e7211973a1a9757f559bdd93a1848901)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93f1159af5221e23c749be8fa0d3df3ef7a93fd0
Author: Alex Converse <alex.converse at gmail.com>
Date: Thu Nov 3 15:55:52 2011 -0700
vp6: Fix illegal read.
(cherry picked from commit 2a6eb06254df79e96b3d791b6b89b2534ced3119)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b08001e00ac4be3dd586825d135b30bdf389d7b0
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Sep 16 18:01:28 2011 -0400
shorten: check output buffer size before decoding
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1ea35fb52d0ad2466c9c0565d99210df3f97237
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Thu Sep 15 18:08:52 2011 -0400
shorten: check for realloc failure
(cherry picked from commit 9e5e2c2d010c05c10337e9c1ec9d0d61495e0c9c)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbfd34246cdddc58a627dd10fc563245601b2162
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:41 2011 +0200
mpegts: do not return from ff_mpegts_parse_packet() after having seen the first PMT
It prevents leaving the AVPacket uninitialized.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bc38e83793be5f7a184c88be55e556453a25224b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feef77ec3a88baa830cfe71a17fe857339cc3ea3
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:40 2011 +0200
mpegts: fix return value when enough ts packets have been parsed or when the first PMT has been seen.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 49ec0c818dc3c1c293a582b57fb58ba611a10b32)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f531193690d91399dd99ae1bf61af311d9734f32
Author: Matthew Einhorn <moiein2000 at gmail.com>
Date: Wed Aug 24 20:14:03 2011 -0400
Fixes avpicture_layout to not write past buffer end.
avpicture_get_size() returns the size of buffer required for avpicture_layout.
For pseudo-paletted formats (gray8...) this size does not include the palette.
However, avpicture_layout doesn't know this and still writes the palette. Consequently,
avpicture_layout writes passed the length of the buffer. This fixes it
by fixing avpicture_layout so that it doesn't write the palette for these formats.
Signed-off-by: Matthew Einhorn <moiein2000 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e662b263d9c500270a8f1dc7e1b81b51d5bdfd4e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e86e9f8b7acd8c68a3d4fefc803756d7ee8737eb
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Oct 14 18:27:59 2011 -0700
avio: Check for invalid buffer length.
(cherry picked from commit ab2940691ba76e1a9b0ce608db0dfc45021d741e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15a7fe106cb4ae57cf9d36bb1ed2006b5a59ba16
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Fri Oct 14 23:46:06 2011 +0200
pthread: copy coded frame dimensions in update_context_from_thread
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit feadcd1bdcbb4601f4ff01878027264fde985ee1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d32f509de1c6bbd2b441cf1ce9fda08504bfae6f
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Fri Oct 14 23:43:29 2011 +0200
vp8: prevent read from uninitialized memory in decode_mvs
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 0f0b5d643401d4d83322eeee0e57eb5a226ef9ab)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f5f36b52e21d9aed347aef73aefe473e7d31409
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Fri Oct 14 23:27:52 2011 +0200
vp8: force reallocation in update_thread_context after frame size change
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 56535793810584f5b3ae59e62cea66fe22d0307d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1166f03bea9da2f14fbbfcc6987e6cef0132da1
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Fri Oct 14 23:21:46 2011 +0200
vp8: fix return value if update_dimensions fails
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit f05c2fb6eb1f9ddaec3c07d1874ba62ec0891269)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d51c7b4cbe022f6b3b026735dc7e29eb50bbf129
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Sat Oct 15 00:03:55 2011 +0200
matroskadec: fix out of bounds write
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 723229c11f1400e6a09c8a1c9c27193f376eb1d1)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e58870a58749eb3266e16166d8370a5f2e960311
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Oct 14 10:38:42 2011 -0700
mov: 10l: Terminate string with 0 not '0'
(cherry picked from commit 7ad06beb2cf31d8a96f475361425d6cc95e8f176)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c18bcfd9cb6b4bbb40d487b52226ed5cf79320e
Author: Alex Converse <alex.converse at gmail.com>
Date: Thu Oct 13 14:47:06 2011 -0700
mov: Prevent illegal writes when chapter titles are very short.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62cf52c8602efe8cf8c4713a8f44d5f76a908bb8
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Oct 12 23:23:18 2011 -0400
truespeech: check to make sure channels == 1
(cherry picked from commit 3e7a176759e8a8e66d65c779b47b5bba793dfd4e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e95a12d51ffc5369f66ab46ce32f8c126678bbc
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Oct 12 22:30:44 2011 -0400
mlpdec: validate that the reported channel count matches the actual output
channel count
(cherry picked from commit caa845851d790f894a2ccbe12580934f75545f92)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c0cddf25517b2fbe208637e599d517832ebc0e3
Author: John Brooks <john.brooks at bluecherry.net>
Date: Wed Oct 12 00:53:12 2011 -0600
rtpdec: Read the packet length for all RTCP packet types
This allows skipping past unsupported RTCP packet types, as
RFC 3550 section 6.1 mandates.
Currently this only has any practical effect if a sender puts
an unrecognized type before RTCP_BYE in a compounded packet, or
(incorrectly) does not put RTCP_SR first.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 07b77fe3871f86b87e35876d38f1969da5ece4b2)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d398d042c1b141277b81a24ba800db2832c5fe9c
Author: John Brooks <john.brooks at bluecherry.net>
Date: Wed Oct 12 11:06:26 2011 +0300
rtpdec: Fix the minimum packet length for RTCP SR packets
We actually read 20 bytes of these packets.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 5d6ecf5345c0913e2b66427ea062e7989201a139)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ae87280e219e843c71201c580780e8e30083559
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 11 22:03:19 2011 +0200
mem: fix memalign hack av_realloc()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fc11927890f38445a950b453d24928525da0e61a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d02df7036d4efef1410a840b3e5ffb7a8c42cf1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 11 20:09:53 2011 +0200
arm: fix av_clipl_int32() asm
Note, the other arm asm code is likely affected too and should be changed as well.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 96bc6485bc929741827fc0f08ef06bea662a3eea)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c3d46a9246af544f3e9b3b81fe8589e58756484
Author: Mans Rullgard <mans at mansr.com>
Date: Tue Oct 11 16:00:21 2011 +0100
h264: fix HRD parameters parsing
The bit_rate_value_minus1 and cpb_size_value_minus1 elements
allow a wider range than get_ue_golomb() supports. This
adds a get_ue_golomb_long() function supporting up to 31
leading zeros, which is the maximum for these syntax
elements, and uses it in decode_hrd_parameters().
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit fdba370f8a1bdfc22ecbdf3c7148c2f8680a4ac4)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=800ab099e332c93c90634b14309c5d56659223a8
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 21 11:49:33 2011 -0400
smacker: validate channels and sample format.
(cherry picked from commit ff1f89de2da3472d133e2c95bf7c9ad2d88df33d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6b225532933655d95266ce772b8a45b14aa27ec
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 21 11:42:55 2011 -0400
smacker: check buffer size before reading output size
(cherry picked from commit cf044f8bff0d28dbc34492f18b0d18b3ba8bad9d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f7b2e89e270801ea5918afa1432d3bb32f6ebc7
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 21 11:37:51 2011 -0400
smacker: validate number of channels
(cherry picked from commit e190e453bd1e4d4b409ed3556b3a50d1087c15d7)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73f85eae68b6d40cad1cd53b04a6ed1a31cced1b
Author: Mans Rullgard <mans at mansr.com>
Date: Mon Oct 10 20:41:31 2011 +0100
sipr: fix get_bits(0) calls
Zero-length get_bits() is undefined, must check before calling.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit c79d2a20bad59298188171f1316a830d563a41ee)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b6080f68523353122e1727a10999bb3bab38e15
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Oct 7 18:41:06 2011 -0700
mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
(cherry picked from commit 0c46e958d1fd3817b8e9fa048d0450d509c80378)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=190807a56c88231d26c9f66f0dc19cb32db3afb4
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Oct 9 20:38:01 2011 +0100
4xm: fix signed overflow
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 84dda407628e298f33d610e9e04a8b2945d24665)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33029d7353b2d005357ff7ef4d6968a9f70acb69
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Oct 9 20:46:22 2011 +0100
wmavoice: fix a signed overflow
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit ba3f07d0611d9a6c10eaa90b3c058ecdffe76676)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c41950099da00e1abd084a09de96793b3d863a97
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Oct 9 20:32:58 2011 +0100
mpegvideo_enc: fix a signed overflow
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 05795f35be4b479bfa8d60ed3eb13e0f89e439c0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f65e396aa13925f125c320895d4b9eda241fbba6
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 01:59:51 2011 +0100
crc: fix signed overflow
This fixes a signed overflow from i << 24 when i == 255 by
making i unsigned. The result of the shift is already
assigned to an variable of unsigned type.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 8b19ae07616bbd18969b94cbf5d74308a8f2bbdf)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=115d88c4b218a2659a5ed9437407ddeda0a7e32e
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 21:22:06 2011 +0100
h264pred: use unsigned types for pixel values, fix signed overflows
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 60f10e0ad37418cc697765d85b0bc22db70f726a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a65045915f5b4ec6da73df54d1914b320a861223
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:36 2011 +0200
qtrle: check for out of bound writes.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7fb92be7e50ea4ba5712804326c6814ae02dd190)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adb12c4deb7685037439ecaea5cac890a6e1f9c3
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:34 2011 +0200
xxan: check for out of bound accesses
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a68a6a4fb19caecc91d5f7fe3ef4f83f6d3c4586)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca58b215ab2c4d593b8be04420dfa6c1720a409c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 21:57:27 2011 +0200
txd: check for out of bound reads.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e182de9a98272fbe4f368000911191aaeb0d6fb3)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67c46b9b3027fdd9fd737e21a80d3326748b1c15
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:01:33 2011 +0200
qtrle: check for invalid line offset
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a4ed7c3fe9f99b89f86b65710d8855dc572f1a25)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ab0b6b7eda60e235b7db07a6895fa8bdade01c8
Author: Laurent Aimar <fenrir at elivagar.org>
Date: Sun Oct 9 01:54:41 2011 +0200
vqavideo: check for out of bound reads.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6d45702f7f257c1cfcd3ce3287bf258854528a4a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b832e539c0dceb2108c8b7f824d9eff9d751853a
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:37 2011 +0200
vqa: fix double free on corrupted streams
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e3123856c79c36507772ada1bcda6cfe36a1e297)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fdbc1d5533ce596bc7e4872dd801c5cdda58aeb
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:39 2011 +0200
vqavideo: check for invalid/unsupported version
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b226af39107f09cd650875388250f4968eea54db)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5415c488f9c6103df06ccfdc77dd50d1f030d271
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:33 2011 +0200
eamad: release the reference frame on video size changes
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6c1fb3e7631178c2a45c6c41b9b8d9ee3a5298fc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79bafbb0dd6af48eae51eb69c472208f97eff11d
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:31 2011 +0200
eamad: check for out of bound reads when doing MC
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit da35797359cec148f3fe59894c62727b0422d75a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b3c851526740cb77fe5af0e48c50b7ead1e0143
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:32 2011 +0200
eamad: avoid NULL derefence when missing the reference frame.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6e20554a6d33e92b81dc3cfed6082e03bff2a7f8)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b6e6439faafb8de96ce01f008918ea36eaff8c2
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:28 2011 +0200
eatgv: fix pointer arithmetic overflows.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6bfe0d4c3d7de11e859ea6720b011cf5fdf5ef03)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44740513709cb326667fc8b7d24abb6e16aacee6
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:27 2011 +0200
eatgv: fix out of bound reads on corrupted motions vectors.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 09302a897d1990b1338f049fcd29638d736b8823)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1646d2d2ae20c32b075cf271c7b276a1d587ebe4
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 8 23:40:30 2011 +0200
eamad: clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 74b9c598396f76407c6b3841c10bc67ddddb2a98)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edc942202b577946c265fe9fdff236fac2b2cc2f
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 02:06:26 2011 +0100
lavf: fix signed overflow in avformat_find_stream_info()
On the first iteration through this code, last_dts is always
INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in
an invalid manner. Although the result is only used if the
input values are valid, performing the subtraction is still
not allowed in a strict environment.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit a31e9f68a426f634e002282885c6c2eb1bfbea44)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7be632cbde8aa094535edf0af3a30a7556acbac
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 15:03:51 2011 +0100
vp8: fix signed overflows
In addition to avoiding undefined behaviour, an unsigned type
makes more sense for packing multiple 8-bit values.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit bb59156606e00057a706ed30165bc7329db3823f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ba0e0375961fcb05d0d4258e75c807c1ed577f5
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 13:52:44 2011 +0100
motion_est: fix some signed overflows
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit e708afd3c026a9eb547dab07781320a7e2564312)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37ce6ba425d70718b646ba49ec23761abd511d9e
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 13:49:42 2011 +0100
dca: fix signed overflow in shift
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 559c244d42be7a02c23976216b47fd63b80d6c7f)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2c83dcb322504807388f804d73d75a45fab004b
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 13:41:23 2011 +0100
aacdec: fix undefined shifts
Since nnz can be zero, this is needed to avoid a shift by 32.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit d12294304acd82cb219e3f66ca9cd6efb2194fa4)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c5cdb493c25a0ffb05022e7afa001725e0adc62
Author: Mans Rullgard <mans at mansr.com>
Date: Sat Oct 8 02:09:42 2011 +0100
put_bits: fix invalid shift by 32 in flush_put_bits()
If flush_put_bits() is called when the 32-bit buffer is empty,
e.g. after writing a multiple of 32 bits, and invalid shift by
32 is performed. Since flush_put_bits() is called infrequently,
this additional check should have negligible performance impact.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit ac6eab1496aad6f8b09deabbef4fe5fd829e142d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06b15b371539cb2f05f717b228d9173d4aee991d
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Oct 6 21:55:44 2011 +0200
h264: fix the size of PPS::chroma_qp_table
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e588a5c2d418fdcf08ece076a2642de44f444d55)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=614ef0dc0d9f2d6ec7e2e41a00d285b7a6a2eea1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 6 22:54:00 2011 +0200
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a3ba542af39ba4425cbb44d2a0ae09c212b40001)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d2b6006f0567629324613ee73b779acbaf8f039
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Mon Oct 3 07:37:24 2011 -0700
mpegvideo: fix position of bottom edge.
It was wrong in colorspaces where horizontal and vertical chroma
subsampling are not the same, e.g. 422.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b491c15c8530fafdf5fcef25b1918339f196fbad
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Oct 4 22:13:56 2011 +0200
h254: explicitly initialize bit depth/chroma idc
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2809f4ab934ca94b32e64f3a70e6008cd3876420
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 14 13:38:07 2011 -0400
qcelp: check output buffer size before decoding
(cherry picked from commit e43dd3d2a8e106169e707484090a2d973ece2184)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2d017e88ff6bb0f557dabfe795d0907c2d11849
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Sep 20 15:27:44 2011 -0400
sipr: fix the output data size check and only calculate it once.
(cherry picked from commit 1b5a189f06879338088809b3049ea7620f4e7e78)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f45967cf5138fb2c7567c5b3d0fb697998b2aeb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 4 04:21:19 2011 +0200
ff_dv_frame_profile2: Check input buffer size.
Based on code by DivX, Inc. / drffmpeg
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 51b0694bc051cda2bfed048a35e694d1047c6ef0)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78eab18740b457bc482845d5f4ec8fe484e0afb3
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 14 13:57:04 2011 -0400
qdm2: check output buffer size before decoding
(cherry picked from commit 7d49f79f1cd47783a963a757a6563b9cac29db62)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=902e9595e3ac5afdedf273a4e69fb43e32d518af
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Oct 3 00:38:50 2011 +0200
MAINTAINERS: new ffplay maintainer
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cffd20b90ee6f35e37cdb51dd94e6b2174fd31b6)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d33a1d650742b579c86df1b77fd9ee5a3dc99b87
Author: Compn <tempn at twmi.rr.com>
Date: Sun Oct 2 17:39:03 2011 -0400
riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.avi
(cherry picked from commit 3ebab62fc67591fd9313fad32892d7d32e805422)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc8c0ee09f8eb8eab6373e1b4946cb503caa9884
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 14 11:39:21 2011 -0400
mpc8: check output buffer size before decoding
(cherry picked from commit 5674d4b0a35a34b75e3533a8580e0b5a0a8895a7)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=490617b6ffa13f8e49a196a752f927d5ebad6e2b
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Sep 14 11:16:42 2011 -0400
mpc7: return error if packet is too small.
(cherry picked from commit 8290d1f38b438f1b070de67645c8b4a42014c7ac)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b833859daa4eb8fe0ec9117859b21a734905b895
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Sep 13 18:53:18 2011 -0400
mpc7: check output buffer size before decoding
(cherry picked from commit c8b5c4d27409dfdcec80868686b173ba446c998b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d52ed686b2ccbb2e72d3930cfba69448c346204
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date: Thu Oct 6 15:19:33 2011 +0200
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
(cherry picked from commit 825dd135d829d85778e6c37f685a6088fef01b2e)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7275dc28f6eec4168dbef79275b605bc73dbc0e4
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date: Thu Oct 6 15:19:33 2011 +0200
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
(cherry picked from commit 825dd135d829d85778e6c37f685a6088fef01b2e)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f74d1c6de7ef810544edae947db1eb1e2c7b6361
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Oct 4 22:13:58 2011 +0200
h264: do not let invalid values in h->ref_count after a decoder reset.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0333d234b0355b375762447e93674e3fe3c5bff1)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e49abd1d92f4ef2258c82f233e138901839eee0c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 4 23:21:52 2011 +0200
libx264: Fix loop failure due to bufsize becoming 0
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 751a4efd4d754b15ebc6027b09051f27860bb1e8)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=414409e6c5260ff8a409a05b34f72ba3d44c61a3
Author: Clément Bœsch <ubitux at gmail.com>
Date: Tue Oct 4 21:34:55 2011 +0200
configure: remove bashism equality check for target_os.
(cherry picked from commit e39be59b85de63e036bd6db9b79a9a9f29a838f7)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09a288476fecb855b77c2b13f939310467735af0
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Oct 4 00:14:48 2011 +0200
H264: hotfix for speedloss on frame threading and h264 files with slices.
This fix is not ideal as it still limits the multithreading on field pictures
to the 2nd field only.
Ill try to fix it properly to allow both fields to decode concurrently but this
needs more work.
This bug exists since and was caused by:
commit ea6331f8bbaf3343faec6ffe77a6218a016a3af5
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Mon Jun 20 10:24:33 2011 -0400
h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).
(cherry picked from commit eaa21b6870ba8bba4b0370e91f1941307c1c9681)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b981c5d4e0f0dd26fd1c03d70a38aef85d6131bc
Author: Loren Osborn <losborn at fwm.tv>
Date: Mon Oct 3 16:03:29 2011 +0200
mpegtsenc: Lift limit on PMT PID
Fixes Ticket518
(cherry picked from commit bf5c3bac51e422580aad011fcd927c818542f054)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=638e183d11367f0ccc46bee6228e5b271fda5a8e
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Sun Aug 28 23:13:17 2011 +0200
Do not set codec_tag property for matroska muxers.
Fixes ticket #8, #537.
(cherry picked from commit 60171d8fa68e90bd623daba970a65c4171cac502)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60171d8fa68e90bd623daba970a65c4171cac502
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Sun Aug 28 23:13:17 2011 +0200
Do not set codec_tag property for matroska muxers.
Fixes ticket #8, #537.
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a39b603bf6d8c6f47c1864100bcd4d656445194c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Oct 3 16:32:17 2011 +0200
lavf/utils: fix overestimation of the rational number density.
Fixes Ticket498
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57f51e843e55815da5bb75ed32a81f60b7b45212
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Oct 3 16:32:17 2011 +0200
lavf/utils: fix overestimation of the rational number density.
Fixes Ticket498
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09d8f515b90d8acd71b4b897622927287e863346
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 22:02:45 2011 +0200
Update for 0.8.5
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b38b6b27981aa13b5fad9b540b1ff6a7b3e8d04a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 22:01:44 2011 +0200
Update for 0.7.6
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fc85451fd47a4607f3cc47d1daa84ae122f5a46
Merge: 42c8fdb b89a0c9
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 21:37:59 2011 +0200
Merge branch 'release/0.8' into release/0.7
* release/0.8: (185 commits)
h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.
h264: check for invalid bit depth value.
h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]
h264: fix the check for invalid SPS:num_ref_frames.
h264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reordering() errors.
Reject video with non multiple of 16 width/height in the 4xm decoder.
4xm decoder: fix data size for i2 frames.
4xm decoder: print some error messages in case of errors.
Check for out of bound accesses in the 4xm decoder.
Prevent block size from inreasing in the shorten decoder.
Check for out of bound reads in PTX decoder.
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers used in 4xm decoder.
Fix the check for missing references in ff_er_frame_end() for H264.
Prevent NULL dereference when the huffman table is invalid in the 4xm decoder.
Fix use of uninitialized memory in 4X Technologies demuxer.
h264: increase ref_poc size to 32 as it can be per field.
h264: set unused ref_counts to 0 as a precautionary meassure.
Remove Chnagelog it has nothing to do with reality
fate: fix motion pixels checksum change caused by backported bugfix
avienc: Add a limit on the number of skiped frames muxed in a row.
...
Conflicts:
Doxyfile
RELEASE
VERSION
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b89a0c9d7f4c4a23d709761033ad5e2f9c2881fa
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 21:07:41 2011 +0200
h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a4fd95b5d511384ed3ce388d8d20a16b1c4c0530)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efedf09378e82cc75d56e881842c5bf14b2c9d05
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 18:29:31 2011 +0200
h264: check for invalid bit depth value.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c2b7f7748be447e1446f63b13da472ba7e00f329)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46edabac3c97669d491016903d0f9014692dfcaa
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 18:29:30 2011 +0200
h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 27d3361e34cf19ad5c0bfb7cfacae0db99b26064)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfd7238adbec83981ddd259e26e9e8f90d78f472
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 16:06:38 2011 +0200
h264: fix the check for invalid SPS:num_ref_frames.
This patch set the limit to 16.
For information, thoses previous commits:
41f7e2d11d2dca23842ee89d530ca9fa15cec9d8
5cbb0e70a0a2ee99eb3cb09e837b9a1f7355b9bc
assumed it was either 30 or 32.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bcf881a6858760ecbd9ff4352a38813dc4232dd6)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf0052931d5776eafacd7771bc9c40da86e31b09
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 16:06:37 2011 +0200
h264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reordering() errors.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2428b53f6d306d8d71dec34fa7b0af733d76cfac)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b998720b29b5fd1c94b01903b0d05c1141fb0c2
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 02:04:45 2011 +0200
Reject video with non multiple of 16 width/height in the 4xm decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit db5b4875514eb7740844f514dbf236c9179a6a93)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a070870facd6bc72f9b943baba2833ce24f075
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 03:40:26 2011 +0200
4xm decoder: fix data size for i2 frames.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0a19b4b0bae772cac7f8341e94c319c96356ee69)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54a1e7b0f28ad4d5d9d50969df2cf786a9aa7e27
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 03:39:59 2011 +0200
4xm decoder: print some error messages in case of errors.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1008f639e2ebaa2b3d48ac765ca49c8869042d75)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c282e96796039b73f0a4b42c97a4432ec51fcd4
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:27 2011 +0200
Check for out of bound accesses in the 4xm decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9c661e952fbcbf044709f9a7031c68cc4860336b)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a96a984ec65736475a8577a158abc5c48fd50a
Author: Laurent Aimar <fenrir at elivagar.org>
Date: Sat Oct 1 00:43:05 2011 +0200
Prevent block size from inreasing in the shorten decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b399cbfba5d901608c18e1a2d48a24c30541a634)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64a9004d0771473b10655a3779b63e4e64505aa7
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:32 2011 +0200
Check for out of bound reads in PTX decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 581898ae882dc37967b689b6ea5f2b2a9acd257a)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f421b534007ad791df593208d7998d07500a666e
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:30 2011 +0200
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers used in 4xm decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 90a69b2f61cbd2d58723d712bdf283e5e56b2ea2)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2a276a3fd7b34583ee7e8e7ec4c8fb85791c674
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:31 2011 +0200
Fix the check for missing references in ff_er_frame_end() for H264.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=535112b3658c21d1f9c4d2b44689342a32ff6eea
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:28 2011 +0200
Prevent NULL dereference when the huffman table is invalid in the 4xm decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4a8ff0636d67c6df059f2ae2df49ad1181de14ca)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e342df4a266f903084a5f705c7f2932e79067de
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Oct 2 00:38:26 2011 +0200
Fix use of uninitialized memory in 4X Technologies demuxer.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a1876e0072aa0c69f037e0cafaca1a54bf2e189b)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86491c5dbc160a10926aa1cf4fa36864b09dfb31
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 00:47:54 2011 +0200
h264: increase ref_poc size to 32 as it can be per field.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8c851ef5a81fb0429453c43fdcfc974ce1b6e447)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e0dbb8a7ed118308cdddac803063b2cd09de37b
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Oct 2 00:45:41 2011 +0200
h264: set unused ref_counts to 0 as a precautionary meassure.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3af2de76ac8b7aa762e4ee129ec29140e6247d81)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cd7580ab51b6173f516d9658949ae3da8601039
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 22:12:01 2011 +0200
Remove Chnagelog it has nothing to do with reality
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0804f37058271baed170f0a39bb0bbaa6c71047
Merge: 77a7092 58decdb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 22:42:41 2011 +0200
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7: (73 commits)
Update Changelog for 0.7.2 release
Update RELEASE file for 0.7.2
lavf: do not set codec_tag for rawvideo
fate: allow testing with libavfilter disabled
fate: separate lavf-mxf_d10 test from lavf-mxf
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
movenc: fix NULL reference in mov_write_tkhd_tag
movenc: create an alternate group for each media type
flvdec: Check for overflow before allocating arrays
ppc: fix some pointer to integer casts
ppc: fix 32-bit PIC build
rv34: Check for invalid slice offsets
rv34: Fix potential overreads
rv34: Avoid NULL dereference on corrupted bitstream
rv10: Reject slices that does not have the same type as the first one
lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
oggdec: fix out of bound write in the ogg demuxer
Fixed size given to init_get_bits().
smacker: fix a few off by 1 errors
Check for invalid VLC value in smacker decoder.
...
Conflicts:
RELEASE
libavcodec/avs.c
libavcodec/ppc/asm.S
libavcodec/rv34.c
libavcodec/xan.c
libavdevice/alsa-audio.h
libavformat/flvdec.c
libavformat/gxf.c
libavformat/utils.c
libswscale/x86/swscale_template.c
tests/ref/lavf/mov
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77a7092d1c22fc49a26514c1e7a36d6a971707d9
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 22:28:16 2011 +0200
fate: fix motion pixels checksum change caused by backported bugfix
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80331265cafe2e331fb47350e00b661eccbe6970
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 03:48:33 2011 +0200
avienc: Add a limit on the number of skiped frames muxed in a row.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9cb9e39c41959961bdb5a1fd51cdd25e10c050f3)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00f6cbb53df64a3a730d9c841dddb534ba562d53
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 03:16:32 2011 +0200
vf_scale.c: propagate error code
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8447703c16b9e6fdc48ce92553ec1cfa2e359b84)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f144a70d6011a71fe6a48ce1b67791301be9b788
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:03 2011 +0200
Fix out of bound reads/writes in the TIFF decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5ca5d432e028ffdd4067b87aed6702168c3207b6)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b08df314dca6946ed644caacb9d3a533a054c0f6
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:05 2011 +0200
Check for out of bound writes in the QDM2 decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4a7876c6e4e62e94d51e364ba99aae4da7671238)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0fb22cea9056afd30848d9d51e92f5ae24ea0f6
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:04 2011 +0200
Fix out of bound reads in the QDM2 decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 491eaf35ae1f9b619441314bec33766e31580184)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=802045777afe0c04cc42ef11f59e273239faaa99
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:02 2011 +0200
Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 346876ec168affe7c21be88d8f1acf1a75cc8409)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8fd4a43ba758adb9378afe2cde4a5b9d4bda357
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:01 2011 +0200
Check for out of bound reads in the Electronic Arts CMV decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a5d46235f3f70f0b620f8e54649ece45ecc5b170)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d950461f599241c770d29deea201d7438211dbbb
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:45:00 2011 +0200
Prevent NULL dereferences when missing the reference frame in the Electronic Arts CMV decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 113d7be62497c4e59db8f224fdb7f0a90cf17d03)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df39708269f5c298dea08d63de37f701295a17d3
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:59 2011 +0200
Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e9064c9ce8ed18c3a3aab61e58e663b8f5b0c551)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f2a93cf4b8f779da88a36e5c636db3dd481185e
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:58 2011 +0200
Prevent infinite loop in the ANM decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 39993860e1525ca5d1b07521865b7e9e1b294ed7)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67b704982fe809e0dec571dc93dcb7520d339cf7
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:57 2011 +0200
Fix double free on error in Deluxe Paint Animation demuxer.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d39d7122e34d2cf994d6dc474fe0c8bee2f7fcfd)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b840fab902e596e2f45de9046253ef955bb1979
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:56 2011 +0200
Check for out of bound reads in AVS decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7afe9e5638242a3210a0fc378e34e3af41e29176)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa79af68453b810af94ccb0260ab38ba7b9bb04c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:55 2011 +0200
Check for out of bound writes in the avs demuxer.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5d44c061cf511d97be5fac8d76be2f3915c6e798)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c23d5261f79671a598f32be8bc403552891af24e
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Oct 1 00:44:54 2011 +0200
Check for corrupted data in avs demuxer.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1cce7def0a8eff2e7db294b7d195a0fb1a5043b0)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=932b5f3cbb22b9357d60914f85675020041299e0
Author: Martin Storsjö <martin at martin.st>
Date: Fri Sep 30 20:30:35 2011 +0300
lavf: Avoid using av_malloc(0) in av_dump_format
On OS X, av_malloc(0) returns pointers that cause crashes when
freed.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit e81e5e8ad2bb5746df0c343c396019aca165cf66)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8ab1adfcdb1f87e3e26425b4499046352009f29
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Sep 23 21:54:44 2011 -0400
avcodec: reject audio packets with NULL data and non-zero size
There is no valid reason the user should ever send such packets in the
first place, but the documentation for CODEC_CAP_DELAY states that the
codec is guaranteed not to get a NULL packet unless that capability is
set. That isn't true without preventing this case.
(cherry picked from commit 6326afd5e90cfed9df08b652a1cd6f6a948c239a)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=107ea3057eb8de8a38c45c2f7181c42ea694b187
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:53 2011 +0200
Fix out of bound writes in fix_bitshift() of the shorten decoder.
The data pointers s->decoded[*] already take into account s->nwrap.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f42b3195d3f2692a4dfc0a8668bb4ac35301f2ed)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=375bd0cfb3d7b86bd5f70d1bc2d15bbd44e3abfe
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:47 2011 +0200
Check for out of bound reads in the Tiertex Limited SEQ decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5d7e3d71673d64a16b58430a0027afadb6b3a54e)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b1bf0852548bffde22b8f27f8eb32ab51559bf1
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:49 2011 +0200
Fix the size of workspace buffers in the motion pixels decoder.
Some buffers must be mod 4 in width and/or height.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 62234a4d3a30f3949694781ef8a941ef55b210fa)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=376b0994746cbb14438c2a58ea1bdb2c9b934610
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:48 2011 +0200
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used in motion pixels decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e60619f9b4bdaf9af46887cdb2c86454567b4a61)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e774cf67e6f30feb9b3dec11713d6b6dc0b521c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:51 2011 +0200
Check for out of bounds writes in the Delphine Software International CIN decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3035c4034b6af3ad47f921e3385196e1b9d44ddf)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18cfe0238df259e4b541d28b465688bea4781b16
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:50 2011 +0200
Check for out of bounds reads in the Delphine Software International CIN decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8e5f093c2cf13eab3d68d893bf8f30c56ba4e733)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=603cb031f19bff898b99fca2234f4cebbcfd743c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 30 00:05:46 2011 +0200
Check for out of bound reads in the QuickDraw decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 44e2f0c3cd2df68659e07ed3d5eab4974794eb33)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2451228b0c2685ec4b09b7beeaa34c4bad6f37cb
Author: Tomas Härdin <tomas.hardin at codemill.se>
Date: Wed Sep 28 10:34:51 2011 +0200
mov: Only touch extradata in mov_read_extradata() if codec_id is what we expect
Extradata should only be parsed from the avss, fiel, jp2h and alac atoms for
AVS, MJPEG, Motion JPEG 2000 and ALAC respectively.
This also fixes the mov demuxer coming up with bogus extradata for some
AVC-Intra samples due to the presence of fiel atoms.
(cherry picked from commit e571305a71494af195891e314b05936f040f89d3)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9efe1d76e2c7fc302337506c42c5fd50ea36b5a
Author: Laurent Aimar <fenrir at videolan.org>
Date: Wed Sep 28 00:45:54 2011 +0200
Check for out of bound reads in xan_huffman_decode() of the xan decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c8b835954ae4aef797112afda3b52f8dfe3c7b74)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=626f11b3bc92011896ae2502788adb423cbd74d9
Author: Mans Rullgard <mans at mansr.com>
Date: Wed Sep 28 21:00:35 2011 +0100
dca: clear inactive subbands only once in qmf_32_subbands()
Writing zeros to the high entries in the array need only be
done once as the cutoff position is constant throughout the
loop.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit bf00a73ace9b1aba790b75dcb26d43adfceb769f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d61c684423c0b78d8ab076fef00d7095e339a97
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sat Aug 13 16:30:44 2011 +0200
vf_unsharp: set default chroma size value to 5x5
The previous default value 0x0 was not good, since it is not even
valid.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 1ee20141900c98f9dc25eca121c66c3ff468c1e4)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d155fdefb88ac45d90600252cd2348d3d6d2cf36
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Fri Aug 12 08:42:35 2011 +0200
vf_unsharp: fix out-of-buffer read
In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.
The check was implemented in the original unsharp libmpcodecs code and
lost in the port.
This also fixes output discrepancy between the two filters.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 998e8519efbc772994c5ba19c0d39573998be9db)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d414c77ded5e8896e3a63dbdbd09bd96e70fbf6e
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Sep 29 01:04:54 2011 +0200
Check for unsupported parameters in ff_j2k_dwt_init()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b4483a531a139f304f4370f470325facb107202f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc9b708f4d79162771d893532fe35159fad0c21d
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Sep 29 01:04:53 2011 +0200
Check for out of bound reads in jpeg 2000 decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 02660a871301adada14b0e0fe64c66f73c2e4541)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8eabfc16ed260ae33bd2c15c240eaf2129dba47
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Sep 29 01:04:52 2011 +0200
Prevent calling init_vlc() with invalid parameters in motionpixels decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 41b7389cade702383e59343561776f83bb26e17f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14617fa7b8e688f5688d3679c906c8cb75ff42ed
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Sep 29 01:04:51 2011 +0200
Prevent NULL dereference when the palette is missing in the xan decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 56ee5a9ad1b385129c40ba4773f99bc5943ae8af)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=485b4317bba908f58ffa62181000c6180c31f698
Author: Laurent Aimar <fenrir at videolan.org>
Date: Thu Sep 29 01:04:49 2011 +0200
Fixed out of bound accesses in xan_unpack() of the xan decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5279141c1d7a72c467b7e0666fc2275cbcec4668)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17b6abab50a42f1b81b8ae2207f86f2c76564380
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
movenc: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 194c2432eecd97c36914956f3bf7781ac4fc6f3d)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfff8db7298e31bc4322af1f1de6fe142d2abd90
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
gxfenc: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit af84d9bb9e8a69a715fc7596d6cbaa00ad00dc29)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=431937883f5d10b461fd8c6ee5a11abc7af8c9b2
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
aviobuf: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 247a1dc84716cb033b538a5bd5ba8b33de0e8260)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bc9c32573ab482d44f62bc08f9e508c81adae33
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
avienc: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e47cfe9e5c10eee3c8d0b6aff81792c0f10e66e1)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1537f86a9347ec7c17cb4be0d6657c583d316d40
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
avidec: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 71e23d39a396f45bbdf258735b02a4bd5e25fd49)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a934e87b18030ac0b94d1761048a5d5aa9d5ed9
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
4xm: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0cc44facf17153454727c26f2f40ee2f77b90df5)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acfe2c9154899b678c7638e3e247ba188cb18cfa
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
libvpxenc: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 769298a6869c3b16557280a63f6502409d1b5e49)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbb191c721d7104e4fcc77b45856cc9d585b0636
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Wed Sep 28 17:16:11 2011 +0200
bitstream: Replace av_realloc by av_realloc_f when relevant.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 198ed6474d603f930430067b8b56955d443e821c)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a75b5a89d11b80e89bb2ff723cfcc270480dc06d
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Sun Mar 20 19:39:20 2011 +0100
Introduce av_realloc_f.
av_realloc_f helps avoiding memory-leaks in typical uses of realloc.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5cd754bca290775ec2dbbf88597ab58e0482efca)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=651e21f584d92709d58242dcad49b238e54dfdd5
Author: Nicolas George <nicolas.george at normalesup.org>
Date: Sun Mar 20 19:39:20 2011 +0100
Introduce av_size_mult.
av_size_mult helps checking for overflow when computing the size of a memory
area.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b2600509fef4d77645491f208b8113c372a32110)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa816e01f401585bcd06e0c3785a8e2270cf37fd
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 22:05:15 2011 +0200
Check for out of bound reads in the flic decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1f024b882094b26c85e87698faa002b8713b5f88)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03a4b489f10c2ed3cb004e1d0bbe9515ebf0e586
Author: Laurent Aimar <fenrir at elivagar.org>
Date: Tue Sep 27 23:53:47 2011 +0200
Prevent out of bound accesses in the xan decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit feca3ba053499e0d38f48910cef9bc431036956f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df0d418ce0efd2d59c60518c4b09995948bd5faf
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 21:24:03 2011 +0200
Check for invalid/corrupted bitstream in sun raster decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b9596a503760ccbd82ca3c03d1c0d5b9449be12b)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b0565e5b8f4a39e8348cbb61c21727d098013a5
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 23:43:57 2011 +0200
Prevent NULL dereferences when missing the reference frame in the xan decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 19e95b88459e879d3e67a66350d937c32ed762ca)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23197f546762e906837fb3293ce8243852b294dd
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 23:43:53 2011 +0200
Check for out of bounds reads in sun rasterfile decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 039f3c33fffd2f4ae376b662ea4ec67c1d6a4c04)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a5e269f03cc812d0309ebe9c4ba5053a804635a
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 23:43:52 2011 +0200
Check for corrupted extra data in wmavoice decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 61930119cbff7572ebe7ade6cd9268becbec37f4)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70727e16ca6840873145332bc16c0cfab1a3cdd5
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 23:43:51 2011 +0200
Check for out of bound writes in the wmavoice decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e09ae22ab7d9af7f1cbfd2445fa71ad9e7c28ee3)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08decaeb95f20821df993a7c3b1692ce654ad390
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 20:22:13 2011 +0200
Prevent NULL dereferences when missing the reference frame in the bink decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 66aae97a60fcd8658f18c484b5af898a48d0e3f9)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1860053820a4a3a9cefa5131dbd263645944bc77
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 01:02:17 2011 +0200
Check for out of bound writes when building tree in bink decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 254af56dd101bc756194dd080bb99e8f123500dd)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=184a156f7aac93cc0e354f526f9842f648c0b433
Author: Laurent Aimar <fenrir at videolan.org>
Date: Tue Sep 27 01:02:16 2011 +0200
Check for various out of bound writes in the bink decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 36bf135d4c32973933000a819208df7da9dd3e16)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9851184d304c85b6863dd3a7553e81f4cba32cfa
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 26 23:37:30 2011 +0200
Reset internal state on corrupted blocks in wavpack decoder.
wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c2a016ad4d9c29285813ba5806189e63e063e0fb)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9770127cd8b16053b23a3f9fa693f23e18f410c6
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 26 23:37:29 2011 +0200
Validate the number of audio channels before using it in wmapro decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fc64434030a8e214fed4179733e49026e7550da5)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=857c7e122b102da5c635852a32ba067157575311
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Mon Sep 12 09:44:21 2011 -0400
ws_snd: make sure number of channels is 1
(cherry picked from commit 6a818cb3ff2056d43361e5fd09e318cd2ca2a7b4)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=915b905a1b7ee9bd1a1526387abf009a755a8df2
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Mon Sep 12 09:41:06 2011 -0400
ws_snd: add some checks to prevent buffer overread or overwrite.
(cherry picked from commit 417364ce1f979031ef6fee661fc15e1869bdb1b4)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4db466db9703fc348cc976387312afd6c283debe
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Mon Sep 12 08:55:43 2011 -0400
ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
8-bit unsigned is the native sample format.
(cherry picked from commit 2322ced8da990835717a176b8d2c32961cfecd3e)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20047f77b9592da17e8bc56e54d3b2e2ca6959a9
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Tue Sep 13 15:13:44 2011 -0400
flacdec: fix buffer size checking in get_metadata_size()
Adds an additional check before reading the next block header and avoids a
potential integer overflow when checking the metadata size against the
remaining buffer size.
(cherry picked from commit 4c5e7b27d57dd2be777780e840eef9be63242158)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e362df304121003fda7705917d5e797b48a0920
Author: Mike Scheutzow <mike.scheutzow at alcatel-lucent.com>
Date: Mon Sep 26 10:57:53 2011 -0400
Fix a buffer overflow in libx264 interface to x264 encoder. Previous code ignored the compressed buffer size passed in. This change returns as many complete NALs as can fit in the buffer, and logs an error message.
Signed-off-by: Mike Scheutzow <mike.scheutzow at alcatel-lucent.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e2dae1faa84ada5746ac2114de7eb68abd824131)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be1ae17ec0e03b494e0ab9f1eedefe83cebd7f4e
Author: tipok <piratfm at gmail.com>
Date: Mon Sep 26 02:28:21 2011 +0200
libaac+ support
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdb72c827c4fc3d8a2dfe939654fa885aaedbbd1
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 25 13:43:38 2011 +0200
Check for out of bound bands limit in mpc v8 decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 508e47a5751b063e5b3d1d6aceda8a19ad8b1d37)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=521dbccc1137fdf3c7ebdd75afe64a4d2567ba22
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 25 13:43:37 2011 +0200
Fix return value on EOF in mpc v8 demuxer.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7ec5ea437fc88ca58d7ac3cd12dfa2f0fbd4011f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7aa24b157dedf39dadade9b0d59071574f6580da
Author: Alexander Strasser <eclipse7 at gmx.net>
Date: Sat Sep 24 18:00:16 2011 +0200
h264: ff_h264_decode_extradata: check buffer args
The buffer size and pointer were not checked prior to testing the first
byte of the buffer. These were sometimes checked before calling, but it is
better to add it inside the function as it takes buf and size arguments.
Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
(cherry picked from commit 715f259bf949b06df1b5ed0307606dc258754c99)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02affe2f0e8603533a80be9a1864cce0039e9c63
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Wed Sep 21 19:10:58 2011 +0200
Compile x86/swscale_template with -mno-red-zone.
Replaces a very hackish hack to fix the same issue (call instruction
overwriting stack variables).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
(cherry picked from commit 424bcc46b5fb0d662e0fb9ad6319c5b9ef3d770f)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6109974cd95cc75a72704029e5608beaaf6691d5
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Sep 25 16:13:07 2011 +0200
ffmpeg: increase bit_buffer_size, the header size is clearly too small for rgb48 raw based formats
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d8289ff9a9a3d0af416e70a1c864e1c6ce095656)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5681d74aaf7e241303aa8785dcdc9b6b437e1573
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 18:39:13 2011 +0200
Add av_calloc() helper.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ccecab4a0d7f3f4f296551c2e22bbf12af7d14e8)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b26a734b23829f0756500f9cec2ac47baa65cd7
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 25 00:08:51 2011 +0200
Fix potential pointer arithmetic overflows in rle_unpack() of vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 35cb6854bb76b4a5b6f2aea2dce81e18d7ab61cd)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02bdeff1ef4915e1794a19184d567ef27e05c9c5
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 25 00:08:50 2011 +0200
Fix out of bound reads in rle_unpack() of vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4749e074987d45cb98935a683a7ee8e1ee376d86)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55efeba2b554f8f2ea134d3d82d01062e0343828
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 25 00:08:49 2011 +0200
Check for out of bound reads in vmd_decode() of vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e07377e7366d038d6f28792c46745463a0542650)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08657a2a8a5f7dc420c41ffe0e1c7eb4878741fb
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 23:52:24 2011 +0200
Fix potential pointer arithmetic overflows in lz_unpack of vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 78cb39d2b2ad731dd3b984b0c0711b9f1d6de004)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f40b04e9178c0a5246271c857437c6745276479c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 23:52:23 2011 +0200
Prevent out of bound read in lz_unpack in vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5127f465bd3e2cf9cbf66dea3cf7b481b522d266)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d92bfc98f9f64fa891ee4a3640ba6c55e90540ef
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 23:16:19 2011 +0200
Prevent NULL dereferences when the previous frame is missing in vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6a6383bebcb03a785797007031ad1c9786a508a5)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ed90c84f6ab75af91b08436cefb8ea464f8495b
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 23:16:18 2011 +0200
Check for invalid update parameters in vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e7aed1280ea14b60fceae04d71dfd03e1daf2d04)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21c9d92646f375f0c3ff9b2bc7b2f5f07a150e74
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 23:16:17 2011 +0200
Fix potential overread in vmd audio decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 00cbe9e4053fd562b6f21e76aca6636ff926b637)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be22dc60f55bb99dcb0a90ad2e8773612a63a288
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 16:16:40 2011 +0200
vp56:Fix error recovery code on size changes in vp5/6 decoder
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35f8ad420a0b7ebcade81c2be3ca5968a5861ddc
Author: Laurent Aimar <fenrir at elivagar.org>
Date: Sat Sep 24 16:19:25 2011 +0200
vp6:Reset the internal state when aborting key frames header parsing in vp6 decoder.
It prevents leaving the state only half initialized.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 91f104496bb7632ed5ff03798e06dd8af014f0d9)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f71c761a9e2e528b739e6c86f624ac66357d2327
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Sep 23 05:42:45 2011 +0200
h264: pass buffer & size to ff_h264_decode_extradata()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=101e38e08a0745a1b99d83d17358c6e81a464f8d
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 24 16:44:14 2011 +0200
h264: Check for out of bounds reads in ff_h264_decode_extradata().
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 57764c699671b32f0c70795feafc0c6d7491f198)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cf6348cf7ef2bbdbd0020ebeb508c2de08a08c4
Author: Sean McGovern <gseanmcg at gmail.com>
Date: Mon Sep 19 21:32:09 2011 -0400
fft: avoid a signed overflow
As a signed integer, 1<<31 overflows, so force it to unsigned.
Signed-off-by: Alex Converse <alex.converse at gmail.com>
(cherry picked from commit c2d3f561072132044114588a5f56b8e1974a2af7)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c0a0f10df9bcb3494eb31cf42ab06371b68b195
Author: Jean First <jeanfirst at gmail.com>
Date: Fri Sep 23 23:39:51 2011 +0200
tiffenc: initialize forgotten avctx.
(cherry picked from commit f7e797aa5c987c39b55666a2d41877ef2aec40bc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92566cf6eefe62d98d9e10e66c6e294e91d493b8
Author: Jean First <jeanfirst at gmail.com>
Date: Fri Sep 23 23:39:26 2011 +0200
tiffenc: Add forgotten avclass to context.
(cherry picked from commit 43c481e56929789883f5b078e0e86d50fcc0025e)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03e7314dd8662bdc20050c03d643b579c415a628
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Sep 23 22:30:27 2011 +0200
aacsbr: add a assert0 to check for a inconsistency that
occurd during debug. I dont know if this can happen normally but if so
it would be quite bad.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit abe0dbea2e228621e97184e39159d189b6085fe3)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e394f7984c6b921210e40f39868597f3627606b8
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Sep 23 19:01:12 2011 +0200
psxstr: improve probe to not misdetect so much.
The score of 50 can probably be raised if needed
Fixes Ticket490
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3f7dc480c1bf6abf4ac0f633a0c7e63d8eb29a55)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3aad92f3e649dcc4f92c805291afb128c663efd3
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Sep 22 18:17:28 2011 +0200
lavf/utils: only complain about aspect missmatch when the difference is "meassureable"
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e8d8517b160bd2dea1279d19ec0efd83e00c8c6c)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d68a6f72d8c2ff02ad3f83522ad17123bf1c4e5
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Sep 22 18:16:57 2011 +0200
mpeg4videoenc: remove forgotten return -1
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f9bb7395a10ae44eb0f0f3f070f23124dfaee06e)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0acc9eff642de0f3d247a728deb320fd4cbb75f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Sep 22 14:08:39 2011 +0200
mpeg4videoenc: guess a good aspect when we cant store the exact one.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 394781a89706479aa56749a9d69c4e74b398dd71)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d36f7cf88ccb869c2febb50c6f42d7a722a6d4f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 01:29:30 2011 +0200
avformat_free_context: favor av_freep()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2a93f28a4b6eef8b93046e0b4e3225f2ff1e7324)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e62ca1ab74a959584db80f42b49f708257abbdcb
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Oct 1 00:58:01 2011 +0200
mpegvideo: increase emu edge buffer size
This fixes a crash with 422 H.264
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7322483d72d4abefae9f5c08c611f521de7236a5)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58decdb639e8582063807b5ddfb86dada6731f74
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Sep 30 18:14:12 2011 +0200
Update Changelog for 0.7.2 release
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35feff418aabd9964509e2c718c65314606545e3
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Sep 30 15:44:19 2011 +0200
Update RELEASE file for 0.7.2
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e257eebd17fbb7e880cfdde8a80c089434b6cf1f
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Jul 17 16:02:33 2011 +0100
lavf: do not set codec_tag for rawvideo
If the demuxer did not set a codec_tag, there is none and
inventing one makes no sense. This change stops the rawvideo
"decoder" over-writing user-supplied pixfmt with one derived
from the codec_tag. The pixfmt-codec_tag-pixfmt round-trip
is lossy since several pixfmts map to the same codec_tag.
This fixes fate-lavf-pixfmt with avfilter disabled.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit bb416bd68ca46b4a3f1901533064d56a6b8ac95e)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bb7a128a34fb5e4abcd265e5dfcb61787ad2f0f
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed Sep 28 00:50:08 2011 +0200
fate: allow testing with libavfilter disabled
This declares dependencies to skip tests using libavfilter
when it is disabled.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 908f12f342341785bf0458e88a06d97a1af90339)
Conflicts:
configure
tests/Makefile
tests/fate.mak
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=783f45de4f3ee03a661c7d1479fe1b513bc0a863
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Jul 17 15:40:05 2011 +0100
fate: separate lavf-mxf_d10 test from lavf-mxf
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 0218808d4980b794c78f57931d671508aed500b5)
required to unbreak fate with --disable-avfilter
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ceede3a802478b6cf0c1cd7d54b76b4af8d00d56
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Sep 28 22:24:05 2011 +0200
h264: fix FIXME and use list_count in ff_h264_fill_mbaff_ref_list()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 237d31e0b98b95eef687e612177ca3ea24b709fc)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be9183de2ec54aab2f3e613b53ead369b6cf22fe
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Sep 28 22:22:56 2011 +0200
h264: More correct ref_count check in decode_slice_header()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dc9ce40069bde3d28f8d0b3e5bd733ae255fecb5)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2443e89d740204c960da0d29c979a9283071a65
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jul 28 14:59:54 2011 +0200
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
Whitespace of the patch cleaned up by Aurel
Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8)
Further suggestions from Kostya <kostya.shishkov at gmail.com> have been
implemented by Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 77d2ef13a8fa630e5081f14bde3fd20f84c90aec)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f9b731a3a2f873b3fb1e4f52e181a43fab6b89b
Author: Anton Khirnov <anton at khirnov.net>
Date: Mon Sep 19 15:15:56 2011 +0200
movenc: fix NULL reference in mov_write_tkhd_tag
st may be NULL when there are more mov streams than AVStreams, e.g. when
chapters are present.
(cherry picked from commit c92a2a4eb8b883e82871c2415f757153d263b6b3)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad47a5ec854d2ec6e451690622a3484010094aa2
Author: Anton Khirnov <anton at khirnov.net>
Date: Fri Sep 16 16:06:45 2011 +0200
movenc: create an alternate group for each media type
Partially fixes bug 44.
(cherry picked from commit 7574cacbd5343bc303ee8333956274716e2444d5)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9960710b872e2d1c7d9d8730c4b6ca2c2cdf183e
Author: Sascha Sommer <saschasommer at freenet.de>
Date: Sat Sep 24 20:56:41 2011 +0200
Fix segfault in save_bits:
use put_bits_count to get the buffer fill state instead of
num_saved_bits as num_saved_bits is sometimes reset when
frames are lost
(Ticket 495)
(cherry picked from commit 780d45473c32fa356c8ce385c3ea4692567c3228)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4f6187c7356111540024901932294e9807061dd0)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42c8fdb943b210b2f79e2510a91ca0f542c9bad0
Author: Sascha Sommer <saschasommer at freenet.de>
Date: Sat Sep 24 20:56:41 2011 +0200
Fix segfault in save_bits:
use put_bits_count to get the buffer fill state instead of
num_saved_bits as num_saved_bits is sometimes reset when
frames are lost
(Ticket 495)
(cherry picked from commit 780d45473c32fa356c8ce385c3ea4692567c3228)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4f6187c7356111540024901932294e9807061dd0)
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fed7f5b04f0ddde81fe1de1af725a63461a31f6f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Sep 24 18:57:31 2011 +0300
flvdec: Check for overflow before allocating arrays
On allocation, the array length is multiplied by sizeof(int64_t),
this prevents the multiplication from overflowing.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit a246cefa75aed2ade315d6d09068aacb6b0fe76b)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dde0fb4aeaf855fc38fb002c23dbbeba06407a09
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Sep 25 18:27:47 2011 +0100
ppc: fix some pointer to integer casts
Use uintptr_t instead of plain int. Without this change, the
comparisons will come out wrong for pointers in certain ranges.
Fixes random failures on ppc64. Also fixes some compiler warnings.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit d853e571ad5e7e12c6a68cfde390daced7d85fbb)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecda54a640a7de55274ad2a86d58d0b483097aac
Author: Mans Rullgard <mans at mansr.com>
Date: Sun Sep 25 12:53:44 2011 +0100
ppc: fix 32-bit PIC build
On 32-bit ppc, the GOT pointer must be loaded manually.
This adds a "get_got" assembler macro to compute the
GOT address. The "movrel" macro is updated to take an
additional parameter containing the GOT address since
no register is reserved for this purpose on ppc32.
These changes have no effect on ppc64 builds.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 6e4a35ced96cdf31a9d3bd82fd147554750af839)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bbb142a140173e1870017b66c439f4d430a6f67
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 19 22:48:53 2011 +0200
rv34: Check for invalid slice offsets
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 4cc7732386eb36661ed22d1200339b38a5fa60bc)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4a1bf0bbf53cc6a736a608732b2ac1de5c2447b
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 17 16:56:30 2011 +0200
rv34: Fix potential overreads
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit b4ed3d78cb6c41c9d3ee5918c326ab925edd6a89)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0bcba238a540793adc514fb84e74282b04d2418
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 17 23:43:58 2011 +0200
rv34: Avoid NULL dereference on corrupted bitstream
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28d948ac44e38e8bec2f6268ccf4747ff4d992a9
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 18 00:03:08 2011 +0200
rv10: Reject slices that does not have the same type as the first one
This prevents crashes with some corrupted bitstreams.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 4a29b471869353c3077fb4b25b6518eb1047afb7)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9973ca992e8499848b8d5b0b536e709109dc65e2
Author: David Goldwich <david.goldwich at gmail.com>
Date: Sat Sep 17 13:50:35 2011 +0200
lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
Signed-off-by: David Goldwich <david.goldwich at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3d471e500674c31fa4f52a62ef789d5e7fdbd3c
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 11 23:26:12 2011 +0200
oggdec: fix out of bound write in the ogg demuxer
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit 0e7efb9d23c3641d50caa288818e8c27647ce74d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54a178f28ff5caf8cac5493cc3f1c22ac2323fcf
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 9 23:46:00 2011 +0200
Fixed size given to init_get_bits().
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.
Signed-off-by: Alex Converse <alex.converse at gmail.com>
(cherry picked from commit b59efc94347ccf0cbc2ff14a5a9e99819c5bdc4d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78cd2e18a4aa2835f6d04cf145121fc82099c1a5
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Sep 13 23:24:56 2011 +0200
smacker: fix a few off by 1 errors
stereo & 16bit is untested due to lack of samples
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 5166376f24545207607f61ed8ff4e1b0572ff320)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d93b03e6861fafd3eddd9ee164cf56630c9d899
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 12 23:49:36 2011 +0200
Check for invalid VLC value in smacker decoder.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 6489455495fc5bfbebcfe3f57e5d4fdd6a781091)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b1f79b092a4684c1e700ea21d5da77c68ca7d44
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 12 23:46:49 2011 +0200
Check and propagate errors when VLC trees cannot be built in smacker decoder.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 9676ffba8346791f494451e68d2a3b37a2918a9b)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f391c4971d4ce2e849a6465a19d1f9da1488194
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 12 20:50:34 2011 +0200
Fixed off by one packet size allocation in the smacker demuxer.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit a92d0fa5d234582583d41b67dddecffc2c819573)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e7905fa9ee75eed404db4d2cca69f833452bf72
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Sep 12 20:50:13 2011 +0200
Check for invalid packet size in the smacker demuxer.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit e055932f5636a82275837968eea9c8fcb5bca474)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ee014309c377f7cfaa9578a393864ae500136f6
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sun Sep 11 19:17:40 2011 +0200
ape demuxer: fix segfault on memory allocation failure.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 273aab99bf7be2bcda95dd64101c2317ee0fcb99)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61ddc8271d61b0e4ebb3b6954fc32f10799da228
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Sep 9 16:10:03 2011 -0700
xan: Add some buffer checks
(cherry picked from commit 0872bb23b4bd2d94a8ba91070f706d1bc1c3ced8)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6694dce1cbaa1ecd2cbe547c9bf45745986e2c1
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Sep 10 00:32:12 2011 +0200
Fixed size given to init_get_bits() in xan decoder.
(cherry picked from commit 393d5031c6aaaf8c2dda4eb5d676974c349fae85)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b9b3570a3e3f3eff088ee061dbab165ff3eff2f
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Mon Sep 12 09:40:42 2011 +0200
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 47a8589f7bc69d1a29da1dfdfbd0dfa78a9e31fd)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b30b7b9bfc83df9ba7c9a39fd0dcd74dfc063f3
Author: Laurent Aimar <fenrir at videolan.org>
Date: Wed Sep 7 21:43:03 2011 +0200
Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=384ed15c2a81812757ecd182f01256f7426af290
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Sep 9 14:50:33 2011 -0700
cljr: init_get_bits size in bits instead of bytes
(cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6550e2b5c51cf7d3d40f666f6966b57f622ffffc
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Sep 9 13:26:49 2011 -0700
indeo2: fail if input buffer too small
(cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af32fa929a81188c4c451f8648f2f650dcf5228a
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Sep 9 13:24:19 2011 -0700
indeo2: init_get_bits size in bits instead of bytes
(cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07b3c4cde582a91377372d1dd2afe7c79230f56e
Author: Laurent Aimar <fenrir at videolan.org>
Date: Fri Sep 9 22:04:09 2011 +0200
ffv1: Fixed size given to init_get_bits() in decoder.
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.
Signed-off-by: Alex Converse <alex.converse at gmail.com>
(cherry picked from commit 46b004959bb7870a361a57272cd5fa7eea34250b)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d4c065476da547fd1a8a604e3047e1b3a7a29d8
Author: Alex Converse <alex.converse at gmail.com>
Date: Thu Sep 8 11:02:43 2011 -0700
wavpack: Check error codes rather than working around error conditions.
(cherry picked from commit dba2b63a98bdcac7bda1a8a2c48950518c075e17)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b84e995ad88f3bfa533c38218f2791c14fd72f0
Author: Laurent Aimar <fenrir at videolan.org>
Date: Wed Sep 7 22:02:55 2011 +0200
Fixed invalid access in wavpack decoder on corrupted bitstream.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 55354b7de21e7bb4bbeb1c12ff55ea17f807c70c)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=685940da4c843beb9283a21718cbd2fa4fa5d796
Author: Laurent Aimar <fenrir at videolan.org>
Date: Wed Sep 7 22:17:39 2011 +0200
Fixed invalid writes in wavpack decoder on corrupted bitstreams.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 0aedab03405849962b469277afe047aa2c61a87f)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aee461277a54736511fdcb6298f0e7f9d90e0672
Author: Laurent Aimar <fenrir at videolan.org>
Date: Wed Sep 7 23:12:32 2011 +0200
Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit beefafda639dd53fc59c21d8a7cf8334da9a1062)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4f2973b2dfb2efe41d4e387eb9be404511da5e0
Author: Anton Khirnov <anton at khirnov.net>
Date: Sun Sep 4 09:56:47 2011 +0200
lavc: fix type for thread_type option
It should be flags, not int.
(cherry picked from commit fb47997edb9d8ff16fc380d005a08c0545624aa6)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54f12d2889390293d59c2a9c36f1bf78fbca8dca
Author: Anton Khirnov <anton at khirnov.net>
Date: Tue Aug 23 07:46:51 2011 +0200
AVOptions: fix av_set_string3() doxy to match reality.
Fixes bug 28.
(cherry picked from commit e955a682e125d44143415ff2b96a99a4dac78da2)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cf3ba89711748b340c31fe018a3a72e8e9b75f1
Author: Sean McGovern <gseanmcg at gmail.com>
Date: Mon Jul 25 18:51:02 2011 -0400
cpu detection: avoid a signed overflow
1<<31 overflows because 1 is signed, so force it to unsigned.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit 5938e02185430ca711106aaec9b5622dbf588af3)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b74db8d2781202742535a466a371a10a108b141
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Mar 9 03:30:24 2011 +0100
vf_scale: don't leak SWS context.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 52982dbe474663709033e1ad259f8ff7a5a2eefa)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db5e27f94ed8e74c2cca45b61085ebad7180e22d
Author: Alberto Delmás <adelmas at gmail.com>
Date: Thu Aug 25 11:00:37 2011 +0200
VC1: Fix first/last row checks with slices
In some places 0/mb_height were used in place of start_mb_y/end_mb_y.
Fixes SA00049, SA00058, SA10091, SA10097, SA10131, SA20021, SA30030
Improves PSNR in SA00054, SA00059, SA00060, SA10096, SA10098, SA20022,
SA30031, SA30032, SA40012, SA40013
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit 1cf82cab0840d669198ea76ab0363aa661950647)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97ce2a29b623f785f6b542846746f51018230df4
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Wed Aug 24 14:36:16 2011 -0700
vc1: properly zero coded_block[] edges on new slice entry.
Previously, we would leave the left edge uninitialized, which led to
CBP prediction errors on slice edges, e.g. in SA10098.vc1.
(cherry picked from commit d4b9974465baf893e90527a366e7a7411ded1ef8)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce8f40a7b9e9fd8bc47181dc4a2b4de0042dac72
Author: Jeff Downs <heydowns at somuchpressure.net>
Date: Tue Jul 5 13:20:06 2011 -0400
h264: fix PCM intra-coded blocks in monochrome case
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 6581e161c5f46733a5619208483de29416eb9a51)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45b3f7c71ec213a2f4177e866586660fcbc68ecd
Author: Jeff Downs <heydowns at somuchpressure.net>
Date: Wed Jul 6 11:54:36 2011 -0400
h264: correct implicit weight table computation for long ref pics
Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 87cf70eb237e7586cc7399627dafa1b980ec0b7d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ad6555f820cc8db5debd5f76d8779cd329def20
Author: Jeff Downs <heydowns at somuchpressure.net>
Date: Tue Jul 5 14:21:54 2011 -0400
h264: correct the check for invalid long term frame index in MMCO decode
The current check on MMCO parameters prohibits a "max long term frame index
plus 1" of 16 (frame idx of 15) for the "set max long term frame index" MMCO.
Fix this off-by-one error to allow the full range of legal values.
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 29a09eae9a827f4dbc9c4517180d8fe2ecef321a)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4099a6dc539c54156a788c7020356c54bc6485e
Author: Alex Converse <alex.converse at gmail.com>
Date: Tue Aug 16 11:03:26 2011 -0700
aac: Only output configure if audio was found.
Audio found is not triggered on a CCE because a CCE alone has no output.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit d8425ed4af6d8fce62ff363cc590f85e57bac06b)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dec458b900439316ebdefa0de2bd1249440859cf
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Wed Aug 17 10:36:33 2011 +0200
rv10/20: tell decoder to use edge emulation
This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 331971116d7d36743601bd2dc5384c5211d3bb48)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe3e7297fe56a383baca484dea2c0d603ae305f8
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Wed Jun 8 14:32:07 2011 +0000
flvenc: use int64_t to store offsets
Metadata currently is written only at the start of the file in normal
cases, when transcoding from a rtmp source metadata could be
written later and the offset recorded can exceed 32bit.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 7f5bf4fbaf1f2142547321a16358f9871fabdcc6)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28321b777f76528b061646a3555d08b94ff667bc
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sat Aug 13 11:58:18 2011 +0200
VC-1: fix reading of custom PAR.
Custom PAR num/denum are in 1-256 range.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 0e8696551414d4ea0aab2559f9475d1fe49d08f3)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a22afa0b50b9037133a7bc26bdc5023e7e1df9
Author: Dustin Brody <libav at parsoma.net>
Date: Thu Aug 11 08:57:58 2011 -0400
h264: notice memory allocation failure
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit bac3ab13ea6a9dd8853e79ef3eacf51d234c8774)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=042934e78676a7854038be560e8f8a7d05552b84
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Aug 10 14:07:35 2011 -0400
Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
bits_per_raw_sample is used in video as well, where sample_fmt is not used.
(cherry picked from commit d271d5b2152cafe540f3ab71d3be6ce8636d2fd6)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67163d751ba1ffa89e61eff224158828d5f673a4
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sat Jan 29 17:05:42 2011 -0800
libx264: do not set pic quality if no frame is output
Avoids uninitialized reads.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 5caa2de19ece830e32c95731bc92a423d55cff0c)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96a453eb85a2d565681842a07ab759a52f1353fd
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Jul 29 15:49:11 2011 -0700
aac: Remove some suspicious illegal memcpy()s from LTP.
(cherry picked from commit a6c49f18abacb9bf52d4d808a2a56561a5b5445c)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c613a891433df18f5188efbab504942be8c809c0
Author: Alex Converse <alex.converse at gmail.com>
Date: Fri Jul 29 15:27:36 2011 -0700
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
This prevents out of bounds reads when extradata is being decoded.
(cherry picked from commit 1f6f58d5855288492fc2640a9f1035c01c75d356)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3b97559bb47fceaaa7fc5aa25a351c9de7f60d6
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Tue Jul 26 10:58:29 2011 -0700
vp3/theora: flush after seek.
(cherry picked from commit 8dcf5184307f072d55fb29373be05ef8b0fd02df)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44c718cf7116203e4e86ff2b92d7dcfd9c77e4b3
Author: Diego Biurrun <diego at biurrun.de>
Date: Thu Jul 21 14:25:01 2011 +0200
rv30: return AVERROR(EINVAL) instead of EINVAL
On some platforms EINVAL could be positive, ensure we return negative values.
(cherry picked from commit e5985185d2eda942333ebbb72bd7d043ffe40be7)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99ec59adbdaced97d892da73e5c881ac122bd27b
Author: Mans Rullgard <mans at mansr.com>
Date: Wed Jul 20 09:55:48 2011 +0100
Fix incorrect max_lowres values
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit e23a05ab0605693aa715b95120bc0132079ded06)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ed12b97bed7f0cd430c4304f166e549b4dad634
Author: Rafaël Carré <rafael.carre at gmail.com>
Date: Sat Jul 16 11:41:08 2011 -0400
Do not decode RV30 files if the extradata is too small
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7831bb104c48118b38d4ba86a7d594fe4fa0f2c
Author: Mans Rullgard <mans at mansr.com>
Date: Fri Jul 15 22:38:10 2011 +0100
aacps: skip some memcpy() if src and dst would be equal
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit e5902d60ce8f7cf10b6e87a57eec536b316261a3)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c2a02466053dd4762d474d89d9be9a957eaaefe
Author: Anton Khirnov <anton at khirnov.net>
Date: Tue Jul 12 22:42:18 2011 +0200
lavf: fix segfault in av_open_input_stream()
ic is NULL in case of error.
(cherry picked from commit 13551ad1e336573e3732fdeaf25607c47244bb80)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8521560fa95c83bfbd95bb1b5adc8ded62a5104
Author: Oskar Arvidsson <oskar at irock.se>
Date: Tue Jul 12 10:52:19 2011 +0200
pix_fmt: Fix number of bits per component in yuv444p9be
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit e59d6b4d7255d6d3dc89580f534e18af1433fe25)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b772a757dd5e58ce94b56daee0deba78ab2e205e
Author: Jindrich Makovicka <makovick at gmail.com>
Date: Thu Jun 30 09:03:15 2011 +0000
mpegts: fix Continuity Counter error detection
According to MPEG-TS specs, the continuity_counter shall not be
incremented when the adaptation_field_control of the packet
equals '00' or '10'.
Signed-off-by: Jindrich Makovicka <jindrich.makovicka at nangu.tv>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 8923cfa328e8eb565aebcfe8672b276fd1c19bf7)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c039db4d8aa0928d9b7466c635247e6439df015
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Jun 22 16:38:20 2011 -0400
alsa: limit buffer_size to 32768 frames.
In testing, the file output plugin gave a max buffer size of about 20 million
frames, which is way more than what is really needed and causes a memory
allocation error on my system.
(cherry picked from commit e35c674d13a7f180412cfe058530a2e7f1d49a90)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ed533f56137f678ff8507012de14d277aded9cc
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Jun 22 15:33:56 2011 -0400
alsa: fallback to buffer_size/4 for period_size.
buffer_size/4 is the value used by aplay. This fixes output to null
devices, e.g. writing ALSA output to a file.
(cherry picked from commit 8bfd7f6a475225a0595bf657f8b99a8fffb461e4)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c75ba07f6eb83439bc44e5504152f8ca03097bec
Author: Tomas Härdin <tomas.hardin at codemill.se>
Date: Thu Jun 23 15:59:33 2011 +0200
gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps
Set DV packet durations using fields_per_frame.
This requires turning gxf_stream_info into the demuxer's context for access to the value in gxf_packet().
Since MPEG-2 seems to work fine this done only for DV.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 99fecc64b064a013559d3d61f7d9790e3c95c80e)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94177614747ebb8a8e1b7e70cfd5229cbac56c04
Author: Anton Khirnov <anton at khirnov.net>
Date: Sun Sep 11 12:27:51 2011 +0200
Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
This reverts commit 2cf8355f98681bdd726b739008acd5483f82f8d7.
AVInputStream.nb_streams tracks number of streams found at the
beginning, new streams may appear that ffmpeg doesn't know about. Fixes
crash in this case.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6107543d4e4f6bfa7810e3696ab57553f7257b4b
Author: Alex Converse <alex.converse at gmail.com>
Date: Wed Jun 29 13:41:47 2011 -0700
adts: Fix PCE copying.
Parse the extension flag bit when reading the MPEG4 AudioSpecificConfig.
This has nothing to do with SBR/PS contradictory to what was noted when it was removed.
(cherry picked from commit 7f01a4192cdf4565eadee457f76e6b5196e35e0b)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9520db07e1e4a795523726329d448d168b188d5
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Tue Jul 5 18:10:48 2011 -0700
eval: fix memleak.
(cherry picked from commit fe277b16f0861a327e1f6c00c0dbb8b00806d60d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15355f9af2a415bbfbffdace04a4341c8af050e7
Author: Mans Rullgard <mans at mansr.com>
Date: Tue Jul 5 18:29:35 2011 +0100
ARM: workaround for bug in GNU assembler
Some versions of the GNU assembler do not handle 64-bit
immediate operands containing arithmetic. Writing the
value out in full works correctly.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit fce1e43410bdc032c4cf2b1c66166a9ed99cc8f1)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=776603b650485f4f2d45f383b772ac5a4f03ebfb
Author: Clément Bœsch <clement.boesch at smartjog.com>
Date: Mon Jul 4 10:19:46 2011 +0200
mxfenc: fix ignored drop flag in binary timecode representation.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit 4d5e7ab5c48451404038706ef3113c9925a83087)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06318968853ff8c628bbc75fb126483c08f22fd9
Author: John Stebbins <stebbins at jetheaddev.com>
Date: Mon Jul 4 09:55:19 2011 -0700
dca: set AVCodecContext frame_size for DTS audio
Set the frame size when decoding DTS audio.
This has the side effect of fixing the computation of timestamps for DTS-HD in compute_pkt_fields. Since frame_size is
not currently set, the duration of a frame is being guessed based on the streams bitrate. But for DTS-HD, the bitrate
currently used is the rate of the DTS core which is much different than the whole DTS-HD stream and leads to a wildly
inaccurate frame duration estimate.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
(cherry picked from commit 49c7006c7e815d4330247624a9e6ba30e288cd02)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ad1f0852b26468cb681ad49be83e2bc25d07934
Author: Jason Garrett-Glaser <jason at x264.com>
Date: Mon Jul 4 06:05:34 2011 -0700
H.264: fix overreads of qscale_table
filter_mb_fast assumed that qscale_table was padded like many of the other tables.
(cherry picked from commit 5029a406334ad0eaf92130e23d596e405a8a5aa0)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47be9f5bd50e9c388adca6f8991cde7b4612db56
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Sun Jun 26 15:52:00 2011 -0700
swscale: don't use planar output functions to write to NV12/21.
This prevents a crash when converting to NV12/21 without the bitexact
flags enabled.
(cherry picked from commit 0d994b2f45c08794899057ee7ca54f48218c0a53)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b00fc80d406fef0acd54619a7c82e2a31e00c06c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Sep 22 02:29:11 2011 +0200
update version numbers for 0.8.4
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
More information about the ffmpeg-cvslog
mailing list