Commit Graph

20168 Commits

Author SHA1 Message Date
Alex Converse 78e65cd772 Merge the AAC encoder from SoC svn. It is still considered experimental.
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 20:01:31 +00:00
Reimar Döffinger 5e039e1b4c Add extra validation checks to ff_vorbis_len2vlc.
They should not be necessary, but it seems like a reasonable precaution.

Originally committed as revision 19374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 19:39:23 +00:00
Reimar Döffinger 1de4ba7155 Make sure that values generated for ff_vorbis_len2vlc in
vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).

Originally committed as revision 19373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 19:31:04 +00:00
Alexis Ballier 287fff266f Add PIX_FMT_ARGB encoding to qtrle.
Patch by Alexis Ballier, alexis ballier gmail

Originally committed as revision 19372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 14:58:16 +00:00
Phil Rutschman 5a1e202b87 Add block_align to sox input.
Patch by Phil Rutschman: name.surname modsystems com

Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:52:56 +00:00
Art Clarke 56c6cf287b Fix mem leak when user preallocates an AVFormatContext, passes it to
av_open_input_file(), but the file does not exist.
Patch by Art Clarke a$(surname) xuggle com

Originally committed as revision 19370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:26:57 +00:00
Diego Biurrun 5c56e74697 Baptiste will maintain qt-faststart from now on.
Originally committed as revision 19369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-07 22:00:13 +00:00
Diego Biurrun 0a4a0aa708 Mention removal of libamr support in the changelog.
Originally committed as revision 19368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-07 21:39:49 +00:00
Diego Biurrun 6ae5c1f0fb whitespace cosmetics: Realign colums after last commit.
Originally committed as revision 19367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-07 09:33:53 +00:00
Diego Biurrun 36b38500b6 Check for CONFIG_LIBFOO_DECODER/CONFIG_LIBFOO_ENCODER instead of just
CONFIG_LIBFOO in the external libraries section.
This is more consistent with the rest of the Makefiles, it makes clearer what
is actually implemented and should be advantageous if we implement an external
library encoder where we previously just had the decoder and vice versa.

Originally committed as revision 19366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-07 09:33:08 +00:00
Diego Biurrun fc1206a4d9 Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding.
libopencore can now be used as a replacement except for AMR-WB encoding.

Originally committed as revision 19365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-07 00:28:16 +00:00
Aurelien Jacobs df2bd71aeb flvdec: expose metadata through the generic metadata API
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:54:37 +00:00
Aurelien Jacobs 09e54e1ff8 flvdec: re-enable metadata parsing
duration and videodatarate values are actually useful
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:49:33 +00:00
Aurelien Jacobs 8caa0f0651 flvdec: don't set format and codec context from metadata values
This has proven to be useless and even harmfull since r18460 (expect
for duration and videodatarate).
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:46:37 +00:00
Reimar Döffinger 96f0731a26 Check for packet_length 0, it is already treated as invalid by the padding check,
but that resulted in a confusing/wrong error message.

Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 17:08:32 +00:00
Reimar Döffinger 4f76697b3e Change av_free to av_freep
Originally committed as revision 19360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 16:49:36 +00:00
Reimar Döffinger 16c8318513 Reallocate internal buffer when coded frame size changes.
Fixes out-of-bounds reads and writes with i32/smclocki32.avi.1.0 from issue 1240.

Originally committed as revision 19359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 16:48:23 +00:00
Reimar Döffinger 28bcc76ab7 Change iv_decode_frame to get AVCodecContext as argument, so that
avcodec_check_dimensions can be called with a proper context instead of NULL.

Originally committed as revision 19358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 16:45:12 +00:00
Reimar Döffinger c79c960ade Remove useless ret variable added in last revision again.
Originally committed as revision 19357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 10:28:58 +00:00
Reimar Döffinger 7cda815044 100l, theora_decode_init must pass on errors from vp3_decode_init
Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 09:35:00 +00:00
Reimar Döffinger c4b7b8bf9c Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
Otherwise this will crash during decoding because the vlc tables are NULL.
Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240.

Originally committed as revision 19355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 09:22:39 +00:00
Frank Barchard 31457d7a2e Do not fail if 'uuid' atom is encountered before 'moov'.
Patch by Frank Barchard, fbarchard at google dot com.

Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 05:36:14 +00:00
Diego Biurrun d03936e5aa libfaac no longer claims to be LGPL.
Originally committed as revision 19353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 05:22:50 +00:00
Diego Biurrun 29ce043374 The AltiVec code in libswscale no longer is under GPL.
Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.

Originally committed as revision 29412 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-07-05 20:10:59 +00:00
Reimar Döffinger e13cca4b14 Ensure that the filter limit values do not exceed the maximum allowed value of 127.
Originally committed as revision 19351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-05 18:27:39 +00:00
Reimar Döffinger 7fa5f9990b Extend init_loop_filter to work for filter limit values up to 127 instead
of only up to 64. 127 is the maximum value allowed by the theora specification.

Originally committed as revision 19350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-05 18:25:58 +00:00
Reimar Döffinger ad92108694 Add a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer.
Originally committed as revision 19349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-05 16:01:51 +00:00
Aurelien Jacobs 7576516a7e vp56dec: ensure range coder won't read past the end of input buffer
Originally committed as revision 19348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-05 15:23:42 +00:00
Reimar Döffinger 5be5daf1e5 Check that palctrl is available on init instead of crashing when trying to use
it on decode.
Fixes mpeg2/smclockmpeg2.avi.2.1 from issue 1240.

Originally committed as revision 19347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-05 12:14:05 +00:00
Loren Merritt e30004fa73 fix a buffer overrun on corrupt huffyuv streams
Originally committed as revision 19346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 23:59:10 +00:00
David Conrad 2483298ae2 ARM: NEON VP3 IDCT
15% faster VP3/Theora, 10% faster VP6

Originally committed as revision 19345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 20:41:11 +00:00
Reimar Döffinger 82c9182fe3 If the end of the input buffer is reached while decoding MJPEG and at least
a valid SOF was found, emulate an EOI.
This allows e.g. to at least decode the available part of incomplete MJPEG frames.

Originally committed as revision 19344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 18:24:43 +00:00
Reimar Döffinger 1496b04c28 Make the MJPEG decoder return -1 when no image was decoded so that decode
errors are actually recognizable as such.

Originally committed as revision 19343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 18:22:33 +00:00
Reimar Döffinger 643fd8a198 Add a got_picture flag to MJpegDecodeContext which indicates if its picture
element is valid. Skip the code handling SOS and EOI if not, since it can not
work without a valid AVPicture.
This fixes a crash with mjpeg/smclockmjpeg.avi.1.0 from issue 1240 where the
decoder returned an invalid AVPicture.

Originally committed as revision 19342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 18:20:35 +00:00
Reimar Döffinger b27bf2a7b4 mjpegdec: check that the coded dc_index and ac_index have a valid associated VLC table.
Removes some disabled dc_index/ac_index checking code that seems to have had
some undocumented issues and should not really be necessary anymore now.
Fixes from issue 1240 the files mjpeg/smclockmjpeg.avi.1.10 and mjpeg/smclockmjpeg.avi.1.171.

Originally committed as revision 19341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 12:54:36 +00:00
Carl Eugen Hoyos 340e230392 Use enum CodecID instead of int.
Fixes the following icc warning:
warning #188: enumerated type mixed with another type

Originally committed as revision 19340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 08:18:03 +00:00
Baptiste Coudurier 4eba9cdd07 fix and simplify long gop mpeg codec ul computation
Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 08:02:01 +00:00
Baptiste Coudurier df1550f081 set index duration to 0 for cbr, specifying whole container coverage
Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:56:58 +00:00
Baptiste Coudurier 76b092e207 use ber4 length for descriptors preferred by specs
Originally committed as revision 19337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:52:28 +00:00
Baptiste Coudurier 6a43aab01b write profile and level local tag in mpeg descriptor
Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:49:12 +00:00
Alexander Strange e5f61b94a1 H.264: Check the return value of decode_vui_parameters()
Files with invalid VUI are now rejected like
other invalid SPS are.

Fixes issue1231.

Originally committed as revision 19335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:46:58 +00:00
Reimar Döffinger 11d058b7b3 Replace invalid Theora frame rate by 25 FPS.
Avoids division by 0 due to e.g. time_base denominator being 0.

Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:31:09 +00:00
Reimar Döffinger 3dcddf82ed Check for failed extradata malloc, fixes a crash in out-of-memory conditions
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:27:52 +00:00
Reimar Döffinger 5a4a4d7839 Check size of "strf" header against size of enclosing "LIST" if there is one.
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:26:14 +00:00
Reimar Döffinger b098b30905 Fix indentation
Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:56 +00:00
Reimar Döffinger 68a10b40bc Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:07 +00:00
Alexander Strange 0410ee8f86 H.264: Don't set data_partitioning for invalid NAL_DPA.
Before, the decoder could interpret a corrupt frame
as a NAL_DPA and NAL_DPC, and then start decoding
even if decode_slice_header() returned an error.
This frequently caused crashes.

Fixes issue1228, issue1229, and partially issue1238.

Originally committed as revision 19328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 05:52:00 +00:00
Art Clarke bda1ad1e73 Cleanup properly at the end of MPEG Audio parsing.
Patch by Art Clarke (aclarke AT xuggle com)

Originally committed as revision 19327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-02 13:13:20 +00:00
Michael Niedermayer e7e5d1e990 If either of num or den is 0 make both 0 in av_set_pts_info().
Originally committed as revision 19326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-02 12:47:58 +00:00
Michael Niedermayer d218a86a0d Make sure av_set_pts_info() does not set the fields of a timebase to
negative values.

Originally committed as revision 19325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 20:52:48 +00:00