RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,663 Commits 36 Branches 392 Tags 315 MiB
Commit Graph

33663 Commits

Author SHA1 Message Date
Mans Rullgard cb668476ab motion_est: make MotionExtContext.map_generation unsigned 
The way this value is used, it should be an unsigned type.
While the numerical value has no meaning, unsigned wraparound
is relied upon.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-11 12:05:50 +01:00
Clément Bœsch d557152285 eval: document recently added random(), hypot(), gcd(). 2011-10-11 07:31:40 +02:00
Michael Niedermayer 1e4d60353c vc1: disable parts of the interlaced code due to security issues. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-11 03:42:51 +02:00
Michael Niedermayer 41f55277fa Merge remote-tracking branch 'qatar/master' 
* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
	Changelog
	configure
	libavcodec/ptx.c
	libavcodec/ra144.c
	libavcodec/vaapi_vc1.c
	libavcodec/vc1.c
	libavcodec/version.h
	libavformat/4xm.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-11 03:42:43 +02:00
Stefano Sabatini fbb8468f20 ffprobe: prefer lowercase section names over uppercase ones 
This is consistent with chapter names. The default writer section names
are converted to uppercase for keeping backward compatibility.
 2011-10-11 00:24:27 +02:00
Laurent Aimar 4c7a232fc8 h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering() 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:36 +02:00
Laurent Aimar e8ac80fb2c error_resilience: fix the check for missing references in ff_er_frame_end() for H264 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:36 +02:00
Laurent Aimar 1b1182ce97 4xm: prevent NULL dereference with invalid huffman table 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:36 +02:00
Laurent Aimar 79964745b3 4xmdemux: prevent use of uninitialized memory 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:35 +02:00
Laurent Aimar 8d518a9c4f 4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:35 +02:00
Laurent Aimar dc64f203a6 ptx: check for out of bound reads 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:37:15 +02:00
Laurent Aimar 04a845caa7 tiffdec: fix out of bound reads/writes 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:13 +02:00
Laurent Aimar 46cb2f6a29 eacmv: check for out of bound reads 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:13 +02:00
Laurent Aimar 8df8a87e3f eacmv: fix potential pointer arithmetic overflows 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:12 +02:00
Laurent Aimar c7f89064e2 adpcm: fix out of bound reads due to integer overflow 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:12 +02:00
Laurent Aimar 2475f1a83c anm: prevent infinite loop 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:12 +02:00
Laurent Aimar 6de33611c9 avsdemux: check for out of bound writes 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:12 +02:00
Laurent Aimar de049a95f4 avs: check for out of bound reads 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:36:12 +02:00
Laurent Aimar 76c6971a64 avsdemux: check for corrupted data 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-10 21:27:04 +02:00
Clément Bœsch 92e36ee567 libmodplug: do not call av_expr_parse() in case of no expr specified. 2011-10-10 21:15:26 +02:00
Clément Bœsch 964465eb1a libmodplug: simpler and faster use of eval expr. 2011-10-10 21:09:30 +02:00
Anton Khirnov 7bb1807c2d AVOptions: refactor set_number/write_number 
write_number() does the actual writing of the supplied
number to destination. Move finding the option and choosing destination
address out of it.
 2011-10-10 20:27:31 +02:00
Anton Khirnov cf10095f0b AVOptions: cosmetics, rename static av_set_number2() to write_number(). 2011-10-10 20:27:31 +02:00
Anton Khirnov b003d0be5b AVOptions: cosmetics, move and rename static av_set_number(). 2011-10-10 20:27:31 +02:00
Anton Khirnov c8d787d2ef AVOptions: split av_set_string3 into opt type-specific functions 
Also stop attempting to honor the alloc parameter, as things break
horribly in that case.
It will be removed in upcoming successor to av_set_string3.
 2011-10-10 20:27:30 +02:00
Mans Rullgard 1703013cb7 avidec: fix signed overflow in avi_sync() 
Keeping byte values read from the file as unsigned is consistent
with how they are subsequently used and avoids an undefined left
shift by 24 when bit 7 is set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-10 17:49:13 +01:00
Alex Converse 0c46e958d1 mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions. 2011-10-10 09:40:26 -07:00
Baptiste Coudurier 11a32d53ca dnxhddec: handle cid change in bitstream. 2011-10-10 09:40:26 -07:00
Kostya Shishkov 109d8aa1e6 vc1: K&R reformatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-10 18:35:35 +02:00
Tomas Härdin d377deaaa3 mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-10 17:40:34 +02:00
Justin Ruggles 8f8f5ae991 ra288: log an error message when output buffer is too small. 
also return AVERROR(EINVAL) instead of -1.
 2011-10-10 11:38:58 -04:00
Justin Ruggles fa6be04bf7 ra288: use a more descriptive calculation for output data size 2011-10-10 11:38:58 -04:00
Justin Ruggles f10524d51c ra144: use macro constants to make the code more understandable. 2011-10-10 11:38:58 -04:00
Justin Ruggles cadd4d332a ra144dec: log an error message when output buffer is too small. 
also return AVERROR(EINVAL) instead of -1.
 2011-10-10 11:38:58 -04:00
Justin Ruggles 80bdf7e0b7 ra144dec: use a more descriptive calculation for output data size 2011-10-10 11:38:57 -04:00
Reimar Döffinger 4b4a6ebd68 Support playing SMV files. 
Audio and video are interleaved via stream cur_dts - no idea how
reliable this is.
It also cannot display the video properly - it is stored with
about 15 in a single JPEG frame, I cannot think of a reasonable
way to implement this.
Samples: http://samples.mplayerhq.hu/smv/
Format description: http://wiki.multimedia.cx/index.php?title=SMV

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-10 17:38:51 +02:00
Clément Bœsch 86a771143f libmodplug: add bintext video stream capability. 2011-10-10 16:56:48 +02:00
Clément Bœsch ade3ec8457 swresample: fix another broken indent chunk. 
Also use a consistent style inside that block.
 2011-10-10 15:55:28 +02:00
Michael Niedermayer b2f88ce21c mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-10 15:40:08 +02:00
Mashiat Sarker Shakkhar 51757ac789 lavc: Micro version bump for VC1 interlaced decoding support 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-10 15:26:37 +02:00
Mashiat Sarker Shakkhar cad16562c8 vc1dec: interlaced stream decoding support 3/3 
Cosmetics: break some lines and reformat TODOs

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-10 15:26:37 +02:00
Mashiat Sarker Shakkhar f0c02e1cbc vc1dec: interlaced stream decoding support 2/3 
Cosmetics: reformat some data tables in vc1data.c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-10 15:26:37 +02:00
Mashiat Sarker Shakkhar d5b015e42d vc1dec: interlaced stream decoding support 1/3 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-10 15:26:37 +02:00
Petter Ericson 1fb30586cf mpegts: Attempt to seek back to beginning in non-seekable mpegts files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-10 14:45:57 +02:00
Gwenole Beauchesne 53efb758c0 vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly). 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-10 14:11:02 +02:00
Diego Biurrun c2ed91de84 configure: Add -Wstrict-prototypes to CFLAGS if available. 2011-10-10 13:50:26 +02:00
Janne Grunau 2886f6759f avidec: simplify size parameter in memset() 2011-10-10 13:28:18 +02:00
Carl Eugen Hoyos 3c8862a567 Add G.723.1 to the documentation. 2011-10-10 10:49:16 +02:00
Carl Eugen Hoyos 0b3e070035 Bump minor for G.723.1 encoder and muxer. 2011-10-10 10:25:07 +02:00
Clément Bœsch 9719f25e7b swresample: fix broken indent. 2011-10-10 09:57:41 +02:00