OSDN Git Service
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>
Compn [Sun, 11 Sep 2011 02:42:11 +0000 (22:42 -0400)]
add libspeex encoder change
Art Clarke [Sun, 11 Sep 2011 01:14:14 +0000 (03:14 +0200)]
libspeex encoder wraper
taken from svn head of xuggle
Clément Bœsch [Tue, 6 Sep 2011 13:48:14 +0000 (15:48 +0200)]
build: fix install rule with --progs-suffix.
Clément Bœsch [Sat, 10 Sep 2011 23:47:57 +0000 (01:47 +0200)]
Fix compilation with --disable-everything --enable-muxer=dv
Michael Niedermayer [Sat, 10 Sep 2011 23:15:36 +0000 (01:15 +0200)]
ffmpeg: replace messy duplicated tag compatibility functions by more generic solution.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 10 Sep 2011 23:12:58 +0000 (01:12 +0200)]
ffmpeg: add vbsf & absf for compatibility.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 10 Sep 2011 22:55:16 +0000 (00:55 +0200)]
mpegts: update comment to match code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Sat, 10 Sep 2011 22:33:20 +0000 (00:33 +0200)]
libavformat/utils: Only require first packet to be known for all audio and video streams
It can take a long time before subtitles or data streams show up,
so we shouldn't wait for those before assuming we have all info
for streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 13 Feb 2011 09:35:00 +0000 (10:35 +0100)]
Remove reference to the libavfilter soc SVN repo, update libavfilter status description
The libavfilter SOC SVN repo is badly outdated, and some filters
supports a syntax different from the current code, so it is better do
not misled users into using it and just drop its reference.
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>
Joakim Plate [Sat, 10 Sep 2011 19:50:45 +0000 (21:50 +0200)]
vp3dec: set key_frame field of AVFrame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Sat, 10 Sep 2011 19:30:42 +0000 (21:30 +0200)]
mpegts: Some additional HDMV types and reg descriptors for mpegts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 10 Sep 2011 18:52:48 +0000 (20:52 +0200)]
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>
Carl Eugen Hoyos [Sat, 10 Sep 2011 18:37:55 +0000 (20:37 +0200)]
Fix copmilation with --disable-everything --enable-muxer=mxf.
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>
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>
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>
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>
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>
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move audio_channels to the options context.
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move *_disable to options context.
Anton Khirnov [Wed, 31 Aug 2011 07:17:08 +0000 (09:17 +0200)]
avconv: remove -[vas]lang options.
They are redundant, the same can be now accomplished with -metadata.
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move codec tags to options context.
Add a new -tag option, make -[vas]tag an alias for -tag:[vas]
chinshou [Sat, 10 Sep 2011 03:23:17 +0000 (05:23 +0200)]
avisynth: Fix upside down bug
chinshou [Sat, 10 Sep 2011 03:21:50 +0000 (05:21 +0200)]
avisynth: Remove wrong pts calculation.
Fixes Ticket428
Michael Niedermayer [Sat, 10 Sep 2011 00:21:22 +0000 (02:21 +0200)]
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>
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>
Alex Converse [Fri, 9 Sep 2011 21:50:33 +0000 (14:50 -0700)]
cljr: init_get_bits size in bits instead of bytes
Alex Converse [Fri, 9 Sep 2011 20:26:49 +0000 (13:26 -0700)]
indeo2: fail if input buffer too small
Alex Converse [Fri, 9 Sep 2011 20:24:19 +0000 (13:24 -0700)]
indeo2: init_get_bits size in bits instead of bytes
Laurent Aimar [Fri, 9 Sep 2011 20:04:09 +0000 (22:04 +0200)]
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>
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>
Michael Niedermayer [Fri, 9 Sep 2011 20:00:50 +0000 (22:00 +0200)]
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>
Michael Niedermayer [Fri, 9 Sep 2011 17:54:04 +0000 (19:54 +0200)]
ffmpeg: fix -re
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
Wolfram Gloger [Fri, 9 Sep 2011 15:15:08 +0000 (17:15 +0200)]
av_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 9 Sep 2011 12:40:18 +0000 (14:40 +0200)]
ffprobe: replace specific ## GNU cpp extension with __VA_ARGS__.
Chiranjeevi Melam [Fri, 9 Sep 2011 01:32:24 +0000 (03:32 +0200)]
asfenc: fix assert failure on long ffserver runs
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
Clément Bœsch [Thu, 8 Sep 2011 21:02:34 +0000 (23:02 +0200)]
ffprobe: replace simple string printing with the appropriate helper.
Michael Niedermayer [Thu, 8 Sep 2011 20:37:31 +0000 (22:37 +0200)]
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>
Chris Rankin [Wed, 7 Sep 2011 09:17:30 +0000 (10:17 +0100)]
qcelpdec: fix the return value of qcelp_decode_frame().
Chris Rankin [Thu, 8 Sep 2011 19:04:26 +0000 (21:04 +0200)]
mp3dec: Dont spam the user on multiple mp3 frames.
Yan Jing [Thu, 8 Sep 2011 18:23:13 +0000 (20:23 +0200)]
ffmdec: set avio buffer to ffm->packet_size, avoid dirty reads
Michael Niedermayer [Thu, 8 Sep 2011 18:36:19 +0000 (20:36 +0200)]
ffmdec: fix seeking for non indexed files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yan Jing [Thu, 8 Sep 2011 18:09:40 +0000 (20:09 +0200)]
ffmdec: handle wrapped file in ffm_seek
Alex Converse [Thu, 8 Sep 2011 18:02:43 +0000 (11:02 -0700)]
wavpack: Check error codes rather than working around error conditions.
Michael Niedermayer [Thu, 8 Sep 2011 15:53:53 +0000 (17:53 +0200)]
doxygen: dont generate docs for avconv.c
This is a workaround to avoid links in the ffmpeg.c documentation randomly pointing to
different code in avconv.c
This should be removed once doxygen is fixed and we upgraded
doxygen 1.7.3 is the latests i tested and that still has this issue.
Fixed Ticket421
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 8 Sep 2011 12:21:38 +0000 (14:21 +0200)]
Employ FF_ARRAY_ELEMS instead of manually calculating array length.
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>
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>
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>
Carl Eugen Hoyos [Thu, 8 Sep 2011 06:24:17 +0000 (08:24 +0200)]
Add loas as an extension for LOAS/LATM.
Carl Eugen Hoyos [Thu, 8 Sep 2011 06:22:50 +0000 (08:22 +0200)]
Support remuxing aac_latm.
James Zern [Thu, 8 Sep 2011 02:14:37 +0000 (19:14 -0700)]
libvpxenc: add 'crf' private option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Thu, 8 Sep 2011 02:14:33 +0000 (19:14 -0700)]
libvpxenc: add 'rc_lookahead' private option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Thu, 8 Sep 2011 02:14:27 +0000 (19:14 -0700)]
libvpxenc: silence AVOption related warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Sep 2011 03:27:01 +0000 (05:27 +0200)]
avopt: Fix searching for constants
Fixes Ticket350
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
zhentan feng [Tue, 23 Aug 2011 13:40:58 +0000 (21:40 +0800)]
WTV muxer (1_extract_wtv_common_code.patch)
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.
Michael Niedermayer [Wed, 7 Sep 2011 20:32:59 +0000 (22:32 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM muxer
v210enc: clip values according to specifications
v210enc: switch to PIX_FMT_422P10
v210dec: switch to PIX_FMT_422P10
AVOptions: remove AVOption.offset <= 0 checks
AVOptions: deprecate av_opt_set_defaults2
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
libx264: fix setting some more parameters
libx264: fix setting the H.264 level
libx264: add 'direct-pred' private option
libx264: add 'partitions' private option
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 7 Sep 2011 12:12:42 +0000 (14:12 +0200)]
rtpdec_asf: 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>
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
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>
Kieran Kunhya [Tue, 6 Sep 2011 19:05:27 +0000 (20:05 +0100)]
Add LATM muxer
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Baptiste Coudurier [Sun, 8 May 2011 15:58:20 +0000 (17:58 +0200)]
v210enc: clip values according to specifications
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Sun, 8 May 2011 15:57:54 +0000 (17:57 +0200)]
v210enc: switch to PIX_FMT_422P10
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Sun, 8 May 2011 15:54:20 +0000 (17:54 +0200)]
v210dec: switch to PIX_FMT_422P10
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 5 Sep 2011 19:44:33 +0000 (21:44 +0200)]
AVOptions: remove AVOption.offset <= 0 checks
They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.
Anton Khirnov [Sun, 4 Sep 2011 09:42:41 +0000 (11:42 +0200)]
AVOptions: deprecate av_opt_set_defaults2
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
Anton Khirnov [Sun, 4 Sep 2011 09:39:49 +0000 (11:39 +0200)]
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
Also change it to be more readable.
Anton Khirnov [Wed, 7 Sep 2011 07:13:02 +0000 (09:13 +0200)]
libx264: fix setting some more parameters
Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.
Andrej Peterka [Wed, 7 Sep 2011 06:27:28 +0000 (08:27 +0200)]
libx264: fix setting the H.264 level
Move setting it after x264_param_default_preset()
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'direct-pred' private option
Deprecate AVCodecContext.directpred
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'partitions' private option
Deprecate AVCodecContext.partitions.
Mark Himsley [Tue, 6 Sep 2011 20:30:18 +0000 (21:30 +0100)]
Correct docs for boxblur parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joseph Wecker [Sat, 27 Aug 2011 00:50:33 +0000 (17:50 -0700)]
flvdec: A little bit of cleanup
Joseph Wecker [Sat, 27 Aug 2011 00:42:22 +0000 (17:42 -0700)]
flvenc: Correctly encode data stream into in-band metadata frames.
Joseph Wecker [Sat, 27 Aug 2011 00:39:11 +0000 (17:39 -0700)]
flvdec: Properly decoding in-band metadata packets as data frames.
Joseph Wecker [Fri, 26 Aug 2011 01:36:32 +0000 (18:36 -0700)]
flvdec: Started to remove most of the "only 1-audio+1-video" assumptions
Joseph Wecker [Thu, 25 Aug 2011 21:04:37 +0000 (14:04 -0700)]
flv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:19:02 +0000 (00:19 +0200)]
Support Speex in isom.
Adobe Flash Media Server produces such files although the f4v
specification does not allow Speex (nor Nellymoser).
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:17:02 +0000 (00:17 +0200)]
Fix decoding of 2/4 bpp Tiff samples.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:03:13 +0000 (00:03 +0200)]
Cosmetics: Fix comment.
Michael Niedermayer [Tue, 6 Sep 2011 22:23:18 +0000 (00:23 +0200)]
libavformat/utils: only run delta_dts_min calculation code when its value is used.
This should improve speed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 22:13:09 +0000 (00:13 +0200)]
libavformat/utils: use FFMIN() where possible
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wg [Tue, 6 Sep 2011 22:10:44 +0000 (00:10 +0200)]
libavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have passed without a packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 20:16:26 +0000 (22:16 +0200)]
avfilter: dont crash on filters with NULL instance names.
Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 19:35:18 +0000 (21:35 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: add 'cplxblur' private option
libx264: add 'deblock' private option
libx264: add 'b-bias' private option
libx264: fix setting some options.
libx264: remove useless assignment
ac3dec: avoid pointless alloc and indirection for input_buffer
mpeg12: cosmetics: reformat as K&R
Conflicts:
libavcodec/libx264.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ramiro Polla [Fri, 2 Sep 2011 04:35:47 +0000 (01:35 -0300)]
dshow: properly disconnect and remove filters from graph
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ramiro Polla [Fri, 2 Sep 2011 04:33:24 +0000 (01:33 -0300)]
dshow: remove some unused code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ramiro Polla [Fri, 2 Sep 2011 04:33:07 +0000 (01:33 -0300)]
vfwcap: actually use framerate option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'cplxblur' private option
Deprecate AVCodecContext.complexityblur
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'deblock' private option
Deprecate AVCodecContext.deblockalpha/deblockbeta
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'b-bias' private option
Deprecate AVCodecContext.bframebias.
Anton Khirnov [Thu, 1 Sep 2011 10:59:29 +0000 (12:59 +0200)]
libx264: fix setting some options.
Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.
Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.
Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.