virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
20,137 Commits 37 Branches 400 Tags 465 MiB
82c9182fe3
Commit Graph

20137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baptiste Coudurier
6be8b20466 Revert r19317, "simplify slice_end, return size of output frame". 
It returns non decodable B-frames.

Originally committed as revision 19324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:35:28 +00:00
Michael Niedermayer
fb6ecd7285 indent 
Originally committed as revision 19323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:34:16 +00:00
Michael Niedermayer
37458d7e1b Make sure we dont read over the end. 
Fixes issue1237.

Originally committed as revision 19322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:30:37 +00:00
Stefano Sabatini
edb501c45b Add an explanation and complete the metadata usage example. 
Originally committed as revision 19320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:11:53 +00:00
Michael Niedermayer
dec14949a6 Make arguments of av_set_pts_info() unsigned. 
Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1

Originally committed as revision 19319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 18:50:31 +00:00
Måns Rullgård
ec62d942ea Fix potentially unaligned accesses in ff_copy_bits() 
A pointer should never be assigned a value which may have less than the
required alignment of the target type.  Compilers may assume pointer
values have the required alignment, and emit normal load/store instructions.

Unaligned pointers should use a character type or compiler-specific
type modifiers.

Originally committed as revision 19318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 17:48:22 +00:00
Baptiste Coudurier
f7f1eb6cc9 simplify slice_end, return size of output frame 
Originally committed as revision 19317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 17:29:52 +00:00
Kostya Shishkov
39c601b5e7 RV3/4 intra types array causes alignment issues (at least on ARM5), thus change 
its stride and offset to always have align 4.

Originally committed as revision 19316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 15:08:02 +00:00
Frank Barchard
06a497afab Use slightly more appropriate format strings for printing decimal values. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 13:46:26 +00:00
Måns Rullgård
b4b9170234 Use enum PixelFormat in sws_format_name() prototype 
Originally committed as revision 29409 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-01 12:40:28 +00:00
Måns Rullgård
4a30fff60d Fix argument type mismatches for av_picture_crop and av_picture_fill 
Originally committed as revision 19314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 10:36:18 +00:00
Baptiste Coudurier
fb0a835ff4 add missing \n to error message 
Originally committed as revision 19313 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 06:48:27 +00:00
Måns Rullgård
6816f8b8e4 ADPCM: remove unreachable break statement after return 
Originally committed as revision 19312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 00:55:17 +00:00
Måns Rullgård
300ad6c16e ARM: use gcc inline asm in bswap.h only when available 
Originally committed as revision 19311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 00:55:15 +00:00
Jason Garrett-Glaser
fe022ce2f8 Fix libx264.c to not drop SEI userdata from x264 encoder. 
Most muxers in ffmpeg ignore the SEI if it is placed in extradata, so instead
it has to be catted to the front of the first video frame.

Originally committed as revision 19310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 23:45:01 +00:00
Frank Barchard
cb28f95454 Use more portable 'PRId64' instead of 'llx' as conversion/length specifier. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 15:11:51 +00:00
Måns Rullgård
d6ced96317 ARM: enable fast_unaligned when --cpu=armv[67] is specified 
Originally committed as revision 19308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 12:46:09 +00:00
Reimar Döffinger
8d8409ca9f Fix nalsize check to avoid an integer overflow that made the check 
incorrect for nalsize > INT_MAX - buf_index

Originally committed as revision 19307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 12:11:29 +00:00
Michael Niedermayer
0444a8c534 Update seek regression checksums due to: 
r19300
  Rewrite mp3 parser. New code is much simpler and does not drop
  stuff at random.

Originally committed as revision 19306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 11:28:53 +00:00
Baptiste Coudurier
b399b932b7 cosmetics, change case and comments alignment 
Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 07:43:32 +00:00
Baptiste Coudurier
61f9e3c16a correctly compute frame flags with closed gop 
Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 07:41:40 +00:00
Stefan Gehrer
470de55aa1 fix slice header checking 
Originally committed as revision 19303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 06:44:32 +00:00
Michael Niedermayer
822d0a6e0c Drop code that attempts to decode frames that are prefixed by junk. 
Too often it ends up decoding random data into noise without detecting
it (for example after seeking of some MP3 data with oddly often occurring
startcode emulation).
Fixes issue1154.

Originally committed as revision 19302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 03:57:27 +00:00
Kostya Shishkov
f3ac96e4d8 Support RGB48 PNG decoding 
Originally committed as revision 19301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 03:37:20 +00:00
Michael Niedermayer
2073fc84ff Rewrite mp3 parser. New code is much simpler and does not drop 
stuff at random.

Originally committed as revision 19300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 03:12:50 +00:00
Alex Converse
ad92558754 Use av_log_missing_feature in the ADTS encoder. (Pseudo reverts r19173). 
Originally committed as revision 19299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 22:48:07 +00:00
Måns Rullgård
07a8eef699 Fix build on Net/OpenBSD 
The renaming in r19293 missed a few things.

Originally committed as revision 19298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 20:45:49 +00:00
Stefano Sabatini
4e622deaab Cosmetics: group together indev/outdev dependencies. 
Originally committed as revision 19297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 20:00:58 +00:00
Ronald S. Bultje
684aa30251 Add doxy to av_log_missing_feature() etc. stating that the function is 
primarily intended for internal use in lavc/lavf, not for use in apps.

Originally committed as revision 19296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 19:17:03 +00:00
Ronald S. Bultje
4811f89bc6 Move av_log_missing_feature() from the internal.h to the public avcodec.h 
header file.

Originally committed as revision 19295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 19:11:53 +00:00
Ronald S. Bultje
ce863d7f36 Rename ff_log_missing_feature() to av_log_missing_feature(). 
Originally committed as revision 19294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 19:07:04 +00:00