OSDN Git Service
Michael Niedermayer [Tue, 13 Sep 2011 03:13:34 +0000 (05:13 +0200)]
ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Sep 2011 13:03:59 +0000 (15:03 +0200)]
ffplay: remove thread command line option code, it is unneeded for -threads X to work.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Sep 2011 12:40:13 +0000 (14:40 +0200)]
avcodec: move "thread emulation" warning to common code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 13 Sep 2011 08:11:16 +0000 (10:11 +0200)]
Fix false positive when detecting dxva2.
Michael Niedermayer [Tue, 13 Sep 2011 02:27:41 +0000 (04:27 +0200)]
libavformat/utils: print ts in the "invalid dts/pts combination" case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Sep 2011 01:52:30 +0000 (03:52 +0200)]
vf_remove_logo: domt access vf->next->query_format() directly but use the API.
This fixes a crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 Sep 2011 23:14:44 +0000 (01:14 +0200)]
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>
Joakim Plate [Mon, 12 Sep 2011 19:11:15 +0000 (21:11 +0200)]
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.
Michael Niedermayer [Mon, 12 Sep 2011 21:45:21 +0000 (23:45 +0200)]
smacker: add forgotten *
found by fenrir
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Wason [Mon, 12 Sep 2011 19:55:34 +0000 (15:55 -0400)]
libx264: fix overwriting presets with flags2
This fixes overwriting x264 preset settings for flags2 based options.
See https://ffmpeg.org/trac/ffmpeg/ticket/448
Joakim Plate [Mon, 12 Sep 2011 19:35:32 +0000 (21:35 +0200)]
asf: only try to read asf index once
This avoid retrying to read ASF index in files for every
attempt to seek. This makes a big difference to protocols
with slow seeking (for example http)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 12 Sep 2011 19:59:00 +0000 (21:59 +0200)]
lavfi: bump minor and update APIchanges after recent updates
These changes were forgotten in commits:
lavfi: simplify signature for avfilter_get_audio_buffer() and friends
(commit
2c0317419bc8c7f28496d5181d951bbe8837071f)
and
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
(commit
4381bddc9f93da34a44e683bdc4c05c6f061244e)
Laurent Aimar [Mon, 12 Sep 2011 19:09:57 +0000 (21:09 +0200)]
segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Mon, 12 Sep 2011 18:58:35 +0000 (20:58 +0200)]
segafilm: Check for memory allocation failures in segafilm demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Wason [Mon, 12 Sep 2011 19:08:45 +0000 (15:08 -0400)]
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.
Joakim Plate [Sun, 11 Sep 2011 17:02:09 +0000 (19:02 +0200)]
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>
Michael Niedermayer [Mon, 12 Sep 2011 18:49:20 +0000 (20:49 +0200)]
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>
Ramiro Polla [Fri, 9 Sep 2011 03:09:42 +0000 (00:09 -0300)]
dshow: indent
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Ramiro Polla [Fri, 9 Sep 2011 03:09:23 +0000 (00:09 -0300)]
dshow: add option to list devices
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Ramiro Polla [Fri, 9 Sep 2011 03:08:43 +0000 (00:08 -0300)]
dshow: factorise cycling through devices
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sun, 21 Aug 2011 17:17:24 +0000 (19:17 +0200)]
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
Also consistent with AVCodecContext.sample_rate. Simplify/avoid
pointless type checks and conversions.
Breaks audio API/ABI.
Stefano Sabatini [Tue, 30 Aug 2011 21:22:29 +0000 (23:22 +0200)]
lavfi: simplify signature for avfilter_get_audio_buffer() and friends
The additional parameters were never used and are complicating the
function interface. Also, they were inconsistent with the way the
video API works.
So this assumes that a requested samples buffer will have *always* the
format specified in the requested link.
This breaks audio filtering API and ABI.
Philip de Nier [Mon, 12 Sep 2011 10:13:44 +0000 (11:13 +0100)]
mxfdec: skip to end of structural sets This fixes reading of partition packs. The code stops reading after the operational pattern and should skip the array of essence container labels that follow
Hendrik Leppkes [Mon, 12 Sep 2011 15:45:25 +0000 (17:45 +0200)]
gitignore: ignore .exp files, as generated by the MS linker on win32
Ignore another filetype, as generated by Microsofts lib.exe when creating the import libraries.
Justin Ruggles [Wed, 7 Sep 2011 22:34:09 +0000 (18:34 -0400)]
adpcm: split ADPCM encoders and decoders into separate files.
Move shared tables to a separate file as well.
Anton Khirnov [Mon, 12 Sep 2011 08:40:43 +0000 (10:40 +0200)]
doc/avconv: fix typo.
Kostya Shishkov [Mon, 12 Sep 2011 09:39:53 +0000 (11:39 +0200)]
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>
Kostya Shishkov [Mon, 12 Sep 2011 07:40:42 +0000 (09:40 +0200)]
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Mon, 12 Sep 2011 10:05:15 +0000 (12:05 +0200)]
ffmpeg: remove unused data_codec_name.
Clément Bœsch [Mon, 12 Sep 2011 10:02:41 +0000 (12:02 +0200)]
ffmpeg: set {audio,video,subtitle}_codec_name const.
This fixes "assignment discards ‘const’ qualifier from pointer target
type." warnings.
Clément Bœsch [Mon, 12 Sep 2011 09:44:14 +0000 (11:44 +0200)]
ffmpeg: a bit more consistent prototypes.
Bobby Bingham [Sat, 21 May 2011 14:46:11 +0000 (16:46 +0200)]
lavfi: add split filter from soc.
Some fixes by Stefano.
For detailed authorship see SOC repo
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sat, 23 Apr 2011 18:55:34 +0000 (20:55 +0200)]
lavfi: add showinfo filter
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 11 Sep 2011 06:14:43 +0000 (08:14 +0200)]
libxavs: add private options corresponding to deprecated global options
Code mostly copied from libx264 wrapper.
Michael Niedermayer [Mon, 12 Sep 2011 04:16:40 +0000 (06:16 +0200)]
alsa: increase max buffer size
Fixes Ticket373
Thanks to llogan for testing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 Sep 2011 04:06:43 +0000 (06:06 +0200)]
h264: improve MAX_SLICES too small check so it gives less false positives.
Fixes Ticket273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 Sep 2011 02:17:39 +0000 (04:17 +0200)]
doc: replace avserver by ffserver as we have not done that rename
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Mon, 12 Sep 2011 02:08:06 +0000 (04:08 +0200)]
rmdec: Check return value of more avio_seek calls
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Mon, 12 Sep 2011 02:07:36 +0000 (04:07 +0200)]
avidec: Check return value of more avio_seek calls
The move of avio_seek in avi_read_seek is to avoiding modifying
state if the seek would fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Mon, 12 Sep 2011 02:06:55 +0000 (04:06 +0200)]
asf: Check return value of more avio_seek calls
This reduces problems when underlying protocol is not
seekable even if marked as such or if the file has been
cut short.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sun, 11 Sep 2011 21:37:44 +0000 (23:37 +0200)]
Fix writes out of bounds in the ogg demuxer.
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Mon, 12 Sep 2011 02:03:40 +0000 (04:03 +0200)]
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>
Michael Niedermayer [Sun, 11 Sep 2011 21:35:35 +0000 (23:35 +0200)]
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>
Joakim Plate [Sun, 11 Sep 2011 19:23:53 +0000 (21:23 +0200)]
gitignore: add files to git ignore generated on a win32 build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sun, 11 Sep 2011 17:17:43 +0000 (19:17 +0200)]
Fixed invalid read access on extra data in cinepak decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sun, 11 Sep 2011 16:51:52 +0000 (18:51 +0200)]
Fixed segfault on corrupted smacker streams in the demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sun, 11 Sep 2011 16:54:01 +0000 (18:54 +0200)]
Fixed segfaults on corruped smacker streams in the decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Laurent Aimar [Sun, 11 Sep 2011 17:17:40 +0000 (19:17 +0200)]
Fixed segfault on memory allocation failure in ape demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Sun, 11 Sep 2011 18:10:22 +0000 (20:10 +0200)]
mpegts: When playing mpegts over rtp/rtsp/sdp, lavf must still read PAT/SDT to get available streams
The code path using for mpegts over rtp doesn't open the demuxer using
mpegts_read_header,
so it never starts listening for PAT/SDT, only uses auto_guess
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 10 Sep 2011 23:07:08 +0000 (01:07 +0200)]
audioconvert: add explanatory comments to channel_names array
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Stefano Sabatini [Sat, 10 Sep 2011 23:06:57 +0000 (01:06 +0200)]
audioconvert: K&R whitespace cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Joakim Plate [Sun, 11 Sep 2011 16:21:07 +0000 (18:21 +0200)]
Fix for some non interleaved avi files that gets played twice or won't end
This changes so we assume EOF when we can't find the next
streams index entry for non interleaved file.
http://trac.xbmc.org/ticket/5585
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Plate [Mon, 28 Jun 2010 05:28:27 +0000 (01:28 -0400)]
Allow reading of growing avi files (ie currently being written)
This uses the RIFF header stored size to figure out the expected AVI file size, instead
of the actual file. To work fully it requires handling failed avio_seek() instead
of assuming they always succeed.
Some fate file has been cut off and contains half a frame at the end which previously
was not output during demuxing. This frame is now output to encoder, thus fate
diff update.
Michael Niedermayer [Sun, 11 Sep 2011 15:35:42 +0000 (17:35 +0200)]
mpeg4videodec: Fix new slice end detection for missing slices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 5 Sep 2011 12:12:28 +0000 (14:12 +0200)]
avconv: use correct index when selecting metadata to write to.
Anton Khirnov [Mon, 5 Sep 2011 12:11:13 +0000 (14:11 +0200)]
avconv: fix inverted variable
Anton Khirnov [Sat, 3 Sep 2011 13:02:52 +0000 (15:02 +0200)]
doc/avconv: document option types (input/output/per-stream/...)
Also trim some redundant stream specifiers descriptions.
Anton Khirnov [Sat, 3 Sep 2011 12:55:39 +0000 (14:55 +0200)]
doc/avtools-common-opts: write a section about stream specifiers.
Anton Khirnov [Sat, 3 Sep 2011 11:02:20 +0000 (13:02 +0200)]
doc/avconv: remove two pointless paragraphs.
They are misleading and carry no useful information.
Anton Khirnov [Sat, 3 Sep 2011 10:53:53 +0000 (12:53 +0200)]
doc/avconv: document that global options should be specified first.
Anton Khirnov [Sat, 3 Sep 2011 05:08:55 +0000 (07:08 +0200)]
doc/avconv: remove entries for nonexistent options
Anton Khirnov [Fri, 2 Sep 2011 20:53:54 +0000 (22:53 +0200)]
doc/avconv: remove documentation for removed 'timestamp' option
Anton Khirnov [Fri, 2 Sep 2011 20:17:38 +0000 (22:17 +0200)]
doc: cosmetics, rename fftools-common-opts to avtools-....
Anton Khirnov [Fri, 2 Sep 2011 20:07:30 +0000 (22:07 +0200)]
avconv: move streamid_map to options context.
Anton Khirnov [Fri, 2 Sep 2011 19:11:00 +0000 (21:11 +0200)]
avconv: extend -vf syntax
Add a per-stream -filter option, make -vf an alias for -filter:v. Move
vfilters to the options context.
Anton Khirnov [Fri, 2 Sep 2011 16:03:31 +0000 (18:03 +0200)]
avconv: move top_field_first to options context.
Anton Khirnov [Fri, 2 Sep 2011 15:57:56 +0000 (17:57 +0200)]
avconv: move inter/intra matrix to options context.
Anton Khirnov [Fri, 2 Sep 2011 15:31:14 +0000 (17:31 +0200)]
avconv: remove -psnr option.
It's redundant -- -flags +psnr does the same thing.
Anton Khirnov [Fri, 2 Sep 2011 15:06:30 +0000 (17:06 +0200)]
avconv: remove me_threshold option.
It's only shadowing the AVOption with the same name.
Anton Khirnov [Fri, 2 Sep 2011 14:06:18 +0000 (16:06 +0200)]
avconv: move video_rc_override_string to options context.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move frame pixel format to the options context.
Also remove redundant -pix_fmt list syntax, it's inconsistent and only
makes the code more complicated. -pix_fmts should be enough for
everyone.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move frame aspect ratio to the options context.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move frame size to the options context.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move frame_rate to the options context.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move force_fps to the options context.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move forced_key_frames to the options context.
Anton Khirnov [Thu, 1 Sep 2011 08:04:35 +0000 (10:04 +0200)]
avconv: rewrite -qscale and -aq handling.
Merge video_qscale (set by -qscale) and audio_qscale (set by -aq) into
one 'qscale' field in the options context. Add a shortcut -q for -qscale
and make -aq an alias for -q:a.
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move audio_sample_rate to the options context.
Anton Khirnov [Wed, 31 Aug 2011 20:24:06 +0000 (22:24 +0200)]
cmdutils: add support for programs in check_stream_specifier()
Remove now redundant (and broken/undocumented) opt_programid.
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move audio_sample_fmt to options context.
Also document it and replace undocumented and inconsistent
'-sample_fmt list' syntax with -sample_fmts.
Georgi Chorbadzhiyski [Thu, 8 Sep 2011 17:38:48 +0000 (20:38 +0300)]
mpegts: improve error reporting
When reporting continuity error show pid, expected and received cc.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Aviad Rozenhek [Thu, 8 Sep 2011 13:18:48 +0000 (16:18 +0300)]
mpegts: on seek, reset the cc for all PIDs
Prevent false positive continuity counter error logs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Edgar Hucek [Sun, 11 Sep 2011 10:53:17 +0000 (12:53 +0200)]
Fix VA-API decoding artefacts.
Fixes ticket #457.
Michael Niedermayer [Sun, 11 Sep 2011 05:23:00 +0000 (07:23 +0200)]
h264: prevent an out of array read in decode_nal_units()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 11 Sep 2011 03:24:26 +0000 (05:24 +0200)]
ffmpeg: dont copy duration when -t is used
Fixes Ticket445
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
Luca Barbato [Sat, 10 Sep 2011 14:23:50 +0000 (10:23 -0400)]
doc: explain __STDC_CONSTANT_MACROS in C++
In order to build C++ programs using libav you need
-D__STDC_CONSTANT_MACROS appened to the CXXFLAGS.
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>