ffmpeg.git
7 years agosmacker: add forgotten *
Michael Niedermayer [Mon, 12 Sep 2011 21:45:21 +0000 (23:45 +0200)]
smacker: add forgotten *
found by fenrir

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f98edc73c599badaa0c075fbffb519a150d03d80)

7 years agosegafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.
Laurent Aimar [Mon, 12 Sep 2011 19:09:57 +0000 (21:09 +0200)]
segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegafilm: Check for memory allocation failures in segafilm demuxer.
Laurent Aimar [Mon, 12 Sep 2011 18:58:35 +0000 (20:58 +0200)]
segafilm: Check for memory allocation failures in segafilm demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7cbe02575868e7d25acf3d319ece664702700f0a)

7 years agorv34: check that subsequent slices have the same type as first one.
Kostya Shishkov [Mon, 12 Sep 2011 09:39:53 +0000 (11:39 +0200)]
rv34: check that subsequent slices have the same type as first one.

This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 23a1f0c59241465ba30103388029a7afc0ead909)

7 years agosmacker demuxer: handle possible av_realloc() failure.
Kostya Shishkov [Mon, 12 Sep 2011 07:40:42 +0000 (09:40 +0200)]
smacker demuxer: handle possible av_realloc() failure.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agogitignore: ignore .exp files, as generated by the MS linker on win32
Hendrik Leppkes [Mon, 12 Sep 2011 15:45:25 +0000 (17:45 +0200)]
gitignore: ignore .exp files, as generated by the MS linker on win32

Ignore another filetype, as generated by Microsofts lib.exe when creating the import libraries.
(cherry picked from commit 73211630110886d849e3de837ca80280a2df2b46)

7 years agormdec: Check return value of more avio_seek calls
Joakim Plate [Mon, 12 Sep 2011 02:08:06 +0000 (04:08 +0200)]
rmdec: Check return value of more avio_seek calls

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7e4111cfe2f5d03af8d608757e897145aa252af8)

7 years agoavidec: Check return value of more avio_seek calls
Joakim Plate [Mon, 12 Sep 2011 02:07:36 +0000 (04:07 +0200)]
avidec: Check return value of more avio_seek calls

The move of avio_seek in avi_read_seek is to avoiding modifying
state if the seek would fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9e083a156f19094cb6fcd134c1ca4ca899a1a6d)

7 years agoasf: Check return value of more avio_seek calls
Joakim Plate [Mon, 12 Sep 2011 02:06:55 +0000 (04:06 +0200)]
asf: Check return value of more avio_seek calls
This reduces problems when underlying protocol is not
seekable even if marked as such or if the file has been
cut short.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac1d489320f476c18d6a8125f73389aecb73f3d3)

7 years agoFix writes out of bounds in the ogg demuxer.
Laurent Aimar [Sun, 11 Sep 2011 21:37:44 +0000 (23:37 +0200)]
Fix writes out of bounds in the ogg demuxer.

Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bc851a2946c64eefb96145b70e2190ff7d5a4827)

7 years agodoc: explain __STDC_CONSTANT_MACROS in C++
Luca Barbato [Sat, 10 Sep 2011 14:23:50 +0000 (10:23 -0400)]
doc: explain __STDC_CONSTANT_MACROS in C++

In order to build C++ programs using libav you need
-D__STDC_CONSTANT_MACROS appened to the CXXFLAGS.
(cherry picked from commit d162994a81a311a8dd212a50a2d2ad2b088df97f)

7 years agogitignore: add files to git ignore generated on a win32 build
Joakim Plate [Sun, 11 Sep 2011 19:23:53 +0000 (21:23 +0200)]
gitignore: add files to git ignore generated on a win32 build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5a6f4a130226e04e0db3bd7c7c1ff76fe3f06080)

7 years agoFixed invalid read access on extra data in cinepak decoder.
Laurent Aimar [Sun, 11 Sep 2011 17:17:43 +0000 (19:17 +0200)]
Fixed invalid read access on extra data in cinepak decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc255275f6293a060518271a151e1ce75499e874)

7 years agoFixed segfault on corrupted smacker streams in the demuxer.
Laurent Aimar [Sun, 11 Sep 2011 16:51:52 +0000 (18:51 +0200)]
Fixed segfault on corrupted smacker streams in the demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d0121e8d969cde74fa7dbd96d3602109b051e701)

7 years agoFixed segfaults on corruped smacker streams in the decoder.
Laurent Aimar [Sun, 11 Sep 2011 16:54:01 +0000 (18:54 +0200)]
Fixed segfaults on corruped smacker streams in the decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d07ac1853da29ea696243160e02154ebf758d1ee)

7 years agoFixed segfault on memory allocation failure in ape demuxer.
Laurent Aimar [Sun, 11 Sep 2011 17:17:40 +0000 (19:17 +0200)]
Fixed segfault on memory allocation failure in ape demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1632a576e68c27229b31f0d1203ff90220e0e024)

7 years agoh264: prevent an out of array read in decode_nal_units()
Michael Niedermayer [Sun, 11 Sep 2011 05:23:00 +0000 (07:23 +0200)]
h264: prevent an out of array read in decode_nal_units()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4)

7 years agoh264dec: Prevent CABAC and CAVLC bitsteram overreading
Michael Niedermayer [Sat, 10 Sep 2011 14:28:53 +0000 (16:28 +0200)]
h264dec: Prevent CABAC and CAVLC bitsteram overreading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f)

7 years agolibspeex encoder wraper
Art Clarke [Sun, 11 Sep 2011 01:14:14 +0000 (03:14 +0200)]
libspeex encoder wraper
taken from svn head of xuggle
(cherry picked from commit a52cdcd296c40882c3b4f88958990c56f0ce3019)

7 years agodvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16
Joakim Plate [Sat, 10 Sep 2011 21:12:29 +0000 (23:12 +0200)]
dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a3294ef0069c898a495c783dfdb2f0bf1dc6583)

7 years agoFixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
Laurent Aimar [Wed, 7 Sep 2011 19:43:03 +0000 (21:43 +0200)]
Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296)

7 years agocljr: init_get_bits size in bits instead of bytes
Alex Converse [Fri, 9 Sep 2011 21:50:33 +0000 (14:50 -0700)]
cljr: init_get_bits size in bits instead of bytes
(cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2)

7 years agoindeo2: fail if input buffer too small
Alex Converse [Fri, 9 Sep 2011 20:26:49 +0000 (13:26 -0700)]
indeo2: fail if input buffer too small
(cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055)

7 years agoindeo2: init_get_bits size in bits instead of bytes
Alex Converse [Fri, 9 Sep 2011 20:24:19 +0000 (13:24 -0700)]
indeo2: init_get_bits size in bits instead of bytes
(cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8)

7 years agocabac test: Change input to test, so a wider range of states is tested.
Michael Niedermayer [Sat, 10 Sep 2011 17:22:39 +0000 (19:22 +0200)]
cabac test: Change input to test, so a wider range of states is tested.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1eb805ed70a0aac35523c7a308145b6b8d05441e)

7 years agocabac test: match encode and decode side
Michael Niedermayer [Sat, 10 Sep 2011 17:20:28 +0000 (19:20 +0200)]
cabac test: match encode and decode side

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 830d7d5c4fbf81265ca5260d59fe8467ac97b2e6)

7 years agocabac: fix cabac encoder
Michael Niedermayer [Sat, 10 Sep 2011 17:18:41 +0000 (19:18 +0200)]
cabac: fix cabac encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89653ea728bd59da2b88967ad648cce685950879)

7 years agoFixed deference of NULL pointer in motionpixels decoder.
Laurent Aimar [Sat, 10 Sep 2011 11:28:13 +0000 (13:28 +0200)]
Fixed deference of NULL pointer in motionpixels decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 824f98f442996eaee9204b132752cf5114fc94cf)

7 years agoavisynth: Fix upside down bug
chinshou [Sat, 10 Sep 2011 03:23:17 +0000 (05:23 +0200)]
avisynth: Fix upside down bug
(cherry picked from commit b10ba1175d3afa28d88cf3b24b69dc4882be16f5)

7 years agoavisynth: Remove wrong pts calculation.
chinshou [Sat, 10 Sep 2011 03:21:50 +0000 (05:21 +0200)]
avisynth: Remove wrong pts calculation.
Fixes Ticket428
(cherry picked from commit 4f123a7d7c8cbf425958e726689c6bdc84605e91)

7 years agoFixed size given to init_get_bits().
Laurent Aimar [Fri, 9 Sep 2011 21:46:00 +0000 (23:46 +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: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5e0580b93a5bda34f62a5df50c1b15e610d4ad1)

7 years agoFixed size given to init_get_bits() in ffv1 decoder.
Laurent Aimar [Fri, 9 Sep 2011 20:04:09 +0000 (22:04 +0200)]
Fixed size given to init_get_bits() in ffv1 decoder.

init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8362a0ffed0b15a9977fcde947bcb49dfc06638b)

7 years agowavpack: Check error codes rather than working around error conditions.
Alex Converse [Thu, 8 Sep 2011 18:02:43 +0000 (11:02 -0700)]
wavpack: Check error codes rather than working around error conditions.
(cherry picked from commit dba2b63a98bdcac7bda1a8a2c48950518c075e17)

7 years agorc: finetune convergence failure fix
Michael Niedermayer [Fri, 9 Sep 2011 16:50:00 +0000 (18:50 +0200)]
rc: finetune convergence failure fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73e0ec2ff453799e361c67395b93df11986609b3)

7 years agorc: fix convergence failure
Michael Niedermayer [Fri, 9 Sep 2011 16:06:51 +0000 (18:06 +0200)]
rc: fix convergence failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed14517c234299387d401959c6037f25e0937f02)

7 years agoFix documentation for "-debug" commandline argument
Panagiotis H.M. Issaris [Wed, 17 Aug 2011 10:20:32 +0000 (12:20 +0200)]
Fix documentation for "-debug" commandline argument
(cherry picked from commit 180e7829428e26413916f0cbc2ad85eeb1fb877e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcef876f168ce8e0263f018f45b8f88ce4dba623)

7 years agoEmploy FF_ARRAY_ELEMS instead of manually calculating array length.
Diego Biurrun [Thu, 8 Sep 2011 12:21:38 +0000 (14:21 +0200)]
Employ FF_ARRAY_ELEMS instead of manually calculating array length.
(cherry picked from commit 6376362d15ccbc02e15d0b3b7a7a5d862efd6b91)

7 years agoFixed invalid writes in wavpack decoder on corrupted bitstreams.
Laurent Aimar [Wed, 7 Sep 2011 20:17:39 +0000 (22:17 +0200)]
Fixed invalid writes in wavpack decoder on corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0aedab03405849962b469277afe047aa2c61a87f)

7 years agoqcelpdec: fix the return value of qcelp_decode_frame().
Chris Rankin [Wed, 7 Sep 2011 09:17:30 +0000 (10:17 +0100)]
qcelpdec: fix the return value of qcelp_decode_frame().
(cherry picked from commit 04c13dca8812e8302686887b6e8201d4ad25b7d8)

7 years agojpeglsdec: fix infinite loop
Michael Niedermayer [Thu, 8 Sep 2011 03:05:11 +0000 (05:05 +0200)]
jpeglsdec: fix infinite loop
Fixes Ticket331

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bd358e128f47c14c7bc9dfceb8dedb3e5697f017)

7 years agoflvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream
Asad Mehmood [Wed, 7 Sep 2011 22:18:07 +0000 (23:18 +0100)]
flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream

If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.
(cherry picked from commit bcc531f04a0590732d42da133c11c138e8d08b59)

7 years agowavpack: fix wrong return value in wavpack_decode_block()
Kostya Shishkov [Mon, 5 Sep 2011 10:37:50 +0000 (12:37 +0200)]
wavpack: fix wrong return value in wavpack_decode_block()

This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit bcd4aa8bec19a17bd633e3db13357784c05b6ca5)

7 years agoCheck extradata size on resolution change.
Reimar Döffinger [Sun, 17 Jul 2011 13:22:36 +0000 (15:22 +0200)]
Check extradata size on resolution change.

Ignore resolution change if resolution not defined in extradata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 09c5f990bc7629dfbee8c760fd485936c60a7b40)

7 years agohttp: Fix decetion of range support in HTTP servers
Stefan Fritsch [Sat, 3 Sep 2011 20:29:07 +0000 (22:29 +0200)]
http:  Fix decetion of range support in HTTP servers

currently libavformat only allows seeking if a request with "Range:
0-" results in a 206 reply from the HTTP server which includes a
Content-Range header. But according to RFC 2616, the server may also
reply with a normal 200 reply (which is more efficient for a request
for the whole file). In fact Apache HTTPD 2.2.20 has changed the
behaviour in this way and it looks like this change will be kept in
future versions. The fix for libavformat is easy: Also look at the
Accept-Ranges header.
(cherry picked from commit 31dfc4959816aa4637e50c7f79660c75205ef84c)

7 years agoDo not free BITMAPINFOHEADER before we are done using it.
Reimar Döffinger [Sat, 27 Aug 2011 13:06:37 +0000 (15:06 +0200)]
Do not free BITMAPINFOHEADER before we are done using it.

Fixes trac ticket #396.
Completely untested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 177aec1257d4dcde2190b6632d9c6e44e3e5c8e9)

7 years agojpegdec: set color_range
Gavin Kinsey [Thu, 1 Sep 2011 14:18:22 +0000 (16:18 +0200)]
jpegdec: set color_range
(cherry picked from commit 2f870e262e953815060de0ebea9b6653133b203e)

7 years agompeg4: fix typo in mpeg4_encode_gop_header()
Michael Niedermayer [Thu, 1 Sep 2011 00:12:15 +0000 (02:12 +0200)]
mpeg4: fix typo in mpeg4_encode_gop_header()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f5bda9fcbb54c9c27503ab1bdb86838eb6f602f1)

7 years agoh264: clean all non null elements of delayed_pic[]
Michael Niedermayer [Wed, 31 Aug 2011 03:04:14 +0000 (05:04 +0200)]
h264: clean all non null elements of delayed_pic[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 66ce282df54edb33515d9ef3015b737428b6e0c3)

7 years agoh264: change MAX_DELAYED_PIC_COUNT check to av_assert0
Michael Niedermayer [Wed, 31 Aug 2011 03:00:39 +0000 (05:00 +0200)]
h264: change MAX_DELAYED_PIC_COUNT check to av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b955ab2f492e3b8c4cbf614f68f8d5bf79e1d1e1)

7 years agoFix VA-API decoding artefacts.
Edgar Hucek [Sun, 11 Sep 2011 10:53:17 +0000 (12:53 +0200)]
Fix VA-API decoding artefacts.

Fixes ticket #457.
(cherry picked from commit 3fec40b601827e75aae9f0baa47671af15de181a)

7 years agowavpack: Check error codes rather than working around error conditions.
Alex Converse [Thu, 8 Sep 2011 18:02:43 +0000 (11:02 -0700)]
wavpack: Check error codes rather than working around error conditions.
(cherry picked from commit dba2b63a98bdcac7bda1a8a2c48950518c075e17)

7 years agoFixed invalid access in wavpack decoder on corrupted bitstream.
Laurent Aimar [Wed, 7 Sep 2011 20:02:55 +0000 (22:02 +0200)]
Fixed invalid access in wavpack decoder on corrupted bitstream.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 55354b7de21e7bb4bbeb1c12ff55ea17f807c70c)

7 years agoFixed invalid writes in wavpack decoder on corrupted bitstreams.
Laurent Aimar [Wed, 7 Sep 2011 20:17:39 +0000 (22:17 +0200)]
Fixed invalid writes in wavpack decoder on corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0aedab03405849962b469277afe047aa2c61a87f)

7 years agoFixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
Laurent Aimar [Wed, 7 Sep 2011 21:12:32 +0000 (23:12 +0200)]
Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit beefafda639dd53fc59c21d8a7cf8334da9a1062)

7 years agoPrevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set
Gavin Kinsey [Thu, 8 Sep 2011 12:01:14 +0000 (13:01 +0100)]
Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set
(cherry picked from commit d64066f6e88c827e33002b2c7740efd62cd5ba7f)

7 years agomp3dec: Dont spam the user on multiple mp3 frames.
Chris Rankin [Thu, 8 Sep 2011 19:04:26 +0000 (21:04 +0200)]
mp3dec: Dont spam the user on multiple mp3 frames.
(cherry picked from commit 54e1eaef6787104083cbc9c9834ea4d13612df9f)

7 years agortpdec_asf: fix memleak n0.8.3
Michael Niedermayer [Wed, 7 Sep 2011 14:48:49 +0000 (16:48 +0200)]
rtpdec_asf: fix memleak

Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a2b66a366d7d9d7dacc217601b5e4406624f91ea)

7 years agoUpdate for 0.8.3
Michael Niedermayer [Wed, 7 Sep 2011 13:19:28 +0000 (15:19 +0200)]
Update for 0.8.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortp: Fix integer underflow that could allow remote code execution.
Michael Niedermayer [Wed, 7 Sep 2011 12:12:42 +0000 (14:12 +0200)]
rtp: Fix integer underflow that could allow remote code execution.

Fixes MSVR-11-0088
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba9a7e0d71bd34f8b89ae99322b62a310be163a6)

7 years agocavsdec: avoid possible crash with crafted input
Michael Niedermayer [Wed, 10 Aug 2011 15:29:51 +0000 (17:29 +0200)]
cavsdec: avoid possible crash with crafted input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f06c1c61e876e930753da200bfe835817e30a53)

7 years agovf_scale: apply the same transform to the aspect during init that is applied per...
Michael Niedermayer [Fri, 26 Aug 2011 23:49:55 +0000 (01:49 +0200)]
vf_scale: apply the same transform to the aspect during init that is applied per frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c8868f28e357e7e6ffe3254d0056b3e8033fe8e5)

7 years agoFix memory corruption in case of memory allocation failure in av_probe_input_buffer()
Michael Niedermayer [Sat, 27 Aug 2011 19:24:13 +0000 (21:24 +0200)]
Fix memory corruption in case of memory allocation failure in av_probe_input_buffer()

Reported-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 941bb552c6e08b40eb7d7842df19285cd650edd0)

7 years agoMake all option parsing functions match the function pointer type through which they...
Jeff Downs [Wed, 29 Jun 2011 16:38:46 +0000 (12:38 -0400)]
Make all option parsing functions match the function pointer type through which they are called.

All option parsing functions now match the function pointer signature through
which they are called (int f(const char *, const char *), thereby working
reliably on all platforms.
Prefix all option processing functions with opt_

7 years agomjpegdec; even better RSTn skiping
Michael Niedermayer [Tue, 6 Sep 2011 16:20:34 +0000 (18:20 +0200)]
mjpegdec; even better RSTn skiping
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a)

7 years agojpegdec: better rst skiping
Michael Niedermayer [Thu, 1 Sep 2011 21:43:56 +0000 (23:43 +0200)]
jpegdec: better rst skiping
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94c2478d90c1b8c007591b8daba13e65d393d2e8)

7 years agompeg4: fix another packed divx issue.
Michael Niedermayer [Tue, 6 Sep 2011 02:09:43 +0000 (04:09 +0200)]
mpeg4: fix another packed divx issue.
Fixes getting_stuck.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dbac85f8d20c77283e3d01f42a7c2154bbf976d)

7 years agompeg4: adjust dummy frame threashold for packed divx.
Michael Niedermayer [Fri, 2 Sep 2011 16:00:31 +0000 (18:00 +0200)]
mpeg4: adjust dummy frame threashold for packed divx.
Fixes Ticket427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3e7e1f1509e6a84bd7873586a66de1ee43c8ef88)

7 years agoMerge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer [Thu, 25 Aug 2011 23:55:08 +0000 (01:55 +0200)]
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  configure: add missing CFLAGS to fix building on the HURD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add missing CFLAGS to fix building on the HURD
Pino Toscano [Fri, 12 Aug 2011 12:11:21 +0000 (14:11 +0200)]
configure: add missing CFLAGS to fix building on the HURD

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f60d13663742d1c695680ede83c4d646bc57d380)

7 years agoMerge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer [Sun, 21 Aug 2011 20:44:58 +0000 (22:44 +0200)]
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  cavs: fix some crashes with invalid bitstreams
  jpegdec: actually search for and parse RSTn

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavs: fix some crashes with invalid bitstreams
Mans Rullgard [Wed, 10 Aug 2011 17:52:11 +0000 (18:52 +0100)]
cavs: fix some crashes with invalid bitstreams

This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4a71da0f3ab7f5542decd11c81994f849d5b2c78)

7 years agojpegdec: actually search for and parse RSTn
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
jpegdec: actually search for and parse RSTn

Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".

References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 8c0fa61a9713a1306fca7997dd04d72ea1f060ea)

7 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Tue, 16 Aug 2011 21:31:09 +0000 (23:31 +0200)]
Fix compilation with --disable-avfilter.
(cherry picked from commit 67a8251690a17f05630eb6f45a73db0f0e806c72)

7 years agolibavfilter: fix --enable-small
Michael Niedermayer [Thu, 21 Jul 2011 09:00:47 +0000 (11:00 +0200)]
libavfilter: fix --enable-small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 633aa01f728b3f67b420e9e34ef21a995578d613)

7 years ago0.8.2 n0.8.2
Michael Niedermayer [Wed, 10 Aug 2011 11:48:30 +0000 (13:48 +0200)]
0.8.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check
Michael Niedermayer [Wed, 10 Aug 2011 11:28:36 +0000 (13:28 +0200)]
cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix possible crash when decoding mpeg streams.
Carl Eugen Hoyos [Thu, 4 Aug 2011 09:06:43 +0000 (11:06 +0200)]
Fix possible crash when decoding mpeg streams.

This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7,
fixes ticket 329.

7 years agoBink: clip AC coefficients during dequantization.
Reimar Döffinger [Sun, 17 Jul 2011 11:03:57 +0000 (13:03 +0200)]
Bink: clip AC coefficients during dequantization.

Fixes artefacts with Neverwinter Nights WOTCLogo.bik
(http://drmccoy.de/zeugs/WOTCLogo.bik).
Fixes trac ticket #352.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 47b71eea099b3fe2c7e16644878ad9b7067974e3)

7 years agoffmpeg: fix passlogfile regression n0.8.1
Michael Niedermayer [Thu, 28 Jul 2011 16:32:26 +0000 (18:32 +0200)]
ffmpeg: fix passlogfile regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix several security issues in matroskadec.c (MSVR-11-0080).
Michael Niedermayer [Thu, 28 Jul 2011 12:59:54 +0000 (14:59 +0200)]
Fix several security issues in matroskadec.c (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@gmx.at>
(cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8)

7 years agoffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
Baptiste Coudurier [Sun, 26 Jun 2011 21:01:00 +0000 (14:01 -0700)]
ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
(cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)

7 years agoFix version numbers
Michael Niedermayer [Mon, 25 Jul 2011 23:01:06 +0000 (01:01 +0200)]
Fix version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer [Mon, 25 Jul 2011 22:14:04 +0000 (00:14 +0200)]
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
Changelog
configure
doc/developer.texi
libavcodec/libvpxenc.c
libavcodec/rawdec.c
libavfilter/x86/gradfun.c
libavformat/Makefile
libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortp: disable udp fifos, the rtp code cannot work with the fifos in its current form...
Michael Niedermayer [Mon, 25 Jul 2011 13:50:56 +0000 (15:50 +0200)]
rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 158eb8599a2811ad8eed9939878982f172b79a89)

7 years agoudp: allow fifo size to be tuned seperately
Michael Niedermayer [Mon, 25 Jul 2011 13:50:13 +0000 (15:50 +0200)]
udp: allow fifo size to be tuned seperately

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bd652ff66e2062df5a05030f211c23e7d4e0be36)

7 years agoriff: Add mpgv MPEG-2 fourcc
Alex Converse [Fri, 22 Jul 2011 17:13:22 +0000 (10:13 -0700)]
riff: Add mpgv MPEG-2 fourcc

Supported by mplayer and seen in the wild.
(cherry picked from commit 505345ed5d180093a44da8d70ac541898c31c22f)

7 years agoUpdate Changelog
Reinhard Tartler [Thu, 21 Jul 2011 07:27:23 +0000 (09:27 +0200)]
Update Changelog

7 years agomatroskadec: fix integer underflow if header length < probe length.
Chris Evans [Wed, 20 Jul 2011 00:51:48 +0000 (17:51 -0700)]
matroskadec: fix integer underflow if header length < probe length.

This fixes a crash with specifically crafted files.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 69619a13c3fef940cba545cf0a283ff22771dd71)

7 years agoffmpeg: fix operation with --disable-avfilter
Mans Rullgard [Sun, 17 Jul 2011 14:27:14 +0000 (15:27 +0100)]
ffmpeg: fix operation with --disable-avfilter

The width and height must be copied from the input before
being used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e9f98c90229999c0e654bd77af55d7020347440a)

7 years agovf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
Stefano Sabatini [Fri, 15 Jul 2011 13:40:31 +0000 (15:40 +0200)]
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h

cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980)

7 years agobuild: Create mlib optimization directories during out-of-tree builds.
Diego Biurrun [Mon, 20 Jun 2011 16:41:11 +0000 (18:41 +0200)]
build: Create mlib optimization directories during out-of-tree builds.

7 years agochangelog: misc typo and wording fixes
Diego Biurrun [Sat, 9 Jul 2011 15:43:53 +0000 (17:43 +0200)]
changelog: misc typo and wording fixes
(cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc)

7 years agodoc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
Diego Biurrun [Sat, 9 Jul 2011 18:15:29 +0000 (20:15 +0200)]
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
(cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)

7 years agomatroskadec: matroska_read_seek after after EBML_STOP leads to failure.
John Stebbins [Fri, 1 Jul 2011 15:57:42 +0000 (08:57 -0700)]
matroskadec: matroska_read_seek after after EBML_STOP leads to failure.

EBML_STOP leaves matroska->current_id set. Then matroska_read_seek changes
the stream position without resetting current_id.  The next
matroska_parse_cluster  fails due to calculation of incorrect pos.  So clear
current_id when avio_seek happens in matroska_read_seek.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit cdc2c1c57616956d975c57b4b69eb73865f513f5)

7 years agoUpdate RELEASE file
Reinhard Tartler [Tue, 12 Jul 2011 16:31:28 +0000 (18:31 +0200)]
Update RELEASE file

7 years agoupdate Changelog
Reinhard Tartler [Mon, 4 Jul 2011 10:11:40 +0000 (12:11 +0200)]
update Changelog

7 years agomt: proper locking around release_buffer calls.
Ronald S. Bultje [Mon, 11 Jul 2011 00:28:28 +0000 (17:28 -0700)]
mt: proper locking around release_buffer calls.

This fixes a crash when seeking in some webm files with many
threads (e.g. 8).
(cherry picked from commit 5eafc8b46644764f8aef1b7b2ecae53ee8034822)

7 years agovp8/mt: flush worker thread, not application thread context, on seek.
Ronald S. Bultje [Mon, 11 Jul 2011 04:23:09 +0000 (21:23 -0700)]
vp8/mt: flush worker thread, not application thread context, on seek.

This prevents a crash when seeking.
(cherry picked from commit d1cf45911935cc4fed9afd3a37d99616d31eb9da)

7 years agodocs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
Martin Storsjö [Fri, 8 Jul 2011 08:00:01 +0000 (11:00 +0300)]
docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit b369f327d5e6b01a4cae9e2726df7c73b2893eba)

7 years agodocs: Use proper markup for a literal command line option
Martin Storsjö [Fri, 8 Jul 2011 10:37:54 +0000 (13:37 +0300)]
docs: Use proper markup for a literal command line option

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a3a94e1498685480800c22fc3ffa20d42ccfd527)