ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 23:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,552 Commits 37 Branches 398 Tags 539 MiB
5ad01decef
Commit Graph

15030 Commits

Author SHA1 Message Date
Michael Niedermayer
838e36635a avcodec: move "thread emulation" warning to common code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 15:05:42 +02:00
Michael Niedermayer
d67e74929c smacker: fix a few off by 1 errors 
stereo & 16bit is untested due to lack of samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 01:27:35 +02:00
Joakim Plate
32c0c562e7 dvdsubdec: Move colormap and alpha to context 
This makes it rememember old values should the stream not
contain new values for these for each subtitle.
 2011-09-13 00:26:27 +02:00
Michael Niedermayer
f98edc73c5 smacker: add forgotten * 
found by fenrir

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 23:55:44 +02:00
Andrew Wason
5e85fd9f9c libx264: fix overwriting presets with flags2 
This fixes overwriting x264 preset settings for flags2 based options.
See https://ffmpeg.org/trac/ffmpeg/ticket/448
 2011-09-12 22:12:47 +02:00
Andrew Wason
3eb1e65f5f libx264: fix overwriting preset rc_lookahead 
This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for
rc_lookahead. A similar problem still exists for the flags2 based
options.
 2011-09-12 21:35:24 +02:00
Joakim Plate
7009b96511 dvdsubdec: Support palette information for vobsub's stored as text in extradata 
This is how mkv's store palette information for vobsubs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:35:10 +02:00
Michael Niedermayer
9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:01:12 +02:00
Justin Ruggles
826c56d16e adpcm: split ADPCM encoders and decoders into separate files. 
Move shared tables to a separate file as well.
 2011-09-12 11:26:11 -04:00
Kostya Shishkov
23a1f0c592 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>
 2011-09-12 15:51:30 +02:00
Anton Khirnov
af1e247038 libxavs: add private options corresponding to deprecated global options 
Code mostly copied from libx264 wrapper.
 2011-09-12 08:45:55 +02:00
Michael Niedermayer
716c1f7b2a h264: improve MAX_SLICES too small check so it gives less false positives. 
Fixes Ticket273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 06:07:58 +02:00
Joakim Plate
340e6735fe mpeg12dec: if lavc's mpeg2 decoder was asked to drop a frame, it could still output an old frame, and mess up timestamps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 04:03:40 +02:00
Michael Niedermayer
411cc5c46a Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  audioconvert: add explanatory comments to channel_names array
  audioconvert: K&R whitespace cosmetics
  avconv: use correct index when selecting metadata to write to.
  avconv: fix inverted variable
  doc/avconv: document option types (input/output/per-stream/...)
  doc/avtools-common-opts: write a section about stream specifiers.
  doc/avconv: remove two pointless paragraphs.
  doc/avconv: document that global options should be specified first.
  doc/avconv: remove entries for nonexistent options
  doc/avconv: remove documentation for removed 'timestamp' option
  doc: cosmetics, rename fftools-common-opts to avtools-....
  avconv: move streamid_map to options context.
  avconv: extend -vf syntax
  avconv: move top_field_first to options context.
  avconv: move inter/intra matrix to options context.
  avconv: remove -psnr option.
  avconv: remove me_threshold option.
  avconv: move video_rc_override_string to options context.
  avconv: move frame pixel format to the options context.
  avconv: move frame aspect ratio to the options context.
  ...

Conflicts:
	avconv.c
	cmdutils_common_opts.h
	doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 00:32:54 +02:00
Laurent Aimar
dc255275f6 Fixed invalid read access on extra data in cinepak decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 21:19:46 +02:00
Laurent Aimar
d07ac1853d Fixed segfaults on corruped smacker streams in the decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 21:19:45 +02:00
Michael Niedermayer
fe0ac337bd mpeg4videodec: Fix new slice end detection for missing slices. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 17:36:37 +02:00
Anton Khirnov
d242d80e36 avconv: remove me_threshold option. 
It's only shadowing the AVOption with the same name.
 2011-09-11 17:30:04 +02:00
Edgar Hucek
3fec40b601 Fix VA-API decoding artefacts. 
Fixes ticket #457.
 2011-09-11 12:54:47 +02:00
Michael Niedermayer
ea0ac11e52 h264: prevent an out of array read in decode_nal_units() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 07:23:00 +02:00
Michael Niedermayer
23f5cff92c h264dec: Prevent CABAC and CAVLC bitsteram overreading 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 04:57:46 +02:00
Art Clarke
a52cdcd296 libspeex encoder wraper 
taken from svn head of xuggle
 2011-09-11 04:07:08 +02:00
Clément Bœsch
754d7f23ee Fix compilation with --disable-everything --enable-muxer=dv 2011-09-11 01:48:29 +02:00
Joakim Plate
4a3294ef00 dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 23:12:29 +02:00
Joakim Plate
8fd1da5bd2 vp3dec: set key_frame field of AVFrame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 22:10:00 +02:00
Michael Niedermayer
7db7eb08e0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
  avconv: move audio_channels to the options context.
  avconv: move *_disable to options context.
  avconv: remove -[vas]lang options.
  avconv: move codec tags to options context.
  cljr: init_get_bits size in bits instead of bytes
  indeo2: fail if input buffer too small
  indeo2: init_get_bits size in bits instead of bytes
  ffv1: Fixed size given to init_get_bits() in decoder.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:52:48 +02:00
Carl Eugen Hoyos
60599c68b0 Fix copmilation with --disable-everything --enable-muxer=mxf. 2011-09-10 20:39:05 +02:00
Michael Niedermayer
1eb805ed70 cabac test: Change input to test, so a wider range of states is tested. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:09:48 +02:00
Michael Niedermayer
830d7d5c4f cabac test: match encode and decode side 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:05:45 +02:00
Michael Niedermayer
89653ea728 cabac: fix cabac encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:05:45 +02:00
Laurent Aimar
8bfea4ab4e Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-10 18:58:57 +03:00
Laurent Aimar
824f98f442 Fixed deference of NULL pointer in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 15:38:59 +02:00
Michael Niedermayer
78a041a9db mpeg4videodec: rewrite the slice end detection of non partitioned packets. 
This no longer needs thread syncronization thus speeding frame multithreading up.
Fixes Ticket28

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 03:20:29 +02:00
Laurent Aimar
e5e0580b93 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>
 2011-09-10 00:26:48 +02:00
Alex Converse
0c1f5b93d9 cljr: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Alex Converse
b7ce4f1d1c indeo2: fail if input buffer too small 2011-09-09 15:01:00 -07:00
Alex Converse
68ca330cbd indeo2: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Laurent Aimar
46b004959b 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@gmail.com>
 2011-09-09 15:00:28 -07:00
Laurent Aimar
8362a0ffed 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>
 2011-09-09 22:19:56 +02:00
Michael Niedermayer
22bf6f7054 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wavpack: Check error codes rather than working around error conditions.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 22:01:31 +02:00
Michael Niedermayer
73e0ec2ff4 rc: finetune convergence failure fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 18:50:00 +02:00
Michael Niedermayer
ed14517c23 rc: fix convergence failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 18:06:51 +02:00
Michael Niedermayer
78d7d8fe91 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 22:37:31 +02:00
Chris Rankin
04c13dca88 qcelpdec: fix the return value of qcelp_decode_frame(). 2011-09-08 21:20:50 +02:00
Chris Rankin
54e1eaef67 mp3dec: Dont spam the user on multiple mp3 frames. 2011-09-08 21:04:26 +02:00
Alex Converse
dba2b63a98 wavpack: Check error codes rather than working around error conditions. 2011-09-08 11:02:43 -07:00
Laurent Aimar
55354b7de2 Fixed invalid access in wavpack decoder on corrupted bitstream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:04:06 +03:00
Laurent Aimar
0aedab0340 Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:00:13 +03:00
Laurent Aimar
beefafda63 Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 11:57:13 +03:00
James Zern
1da43f7e99 libvpxenc: add 'crf' private option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00