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
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
f0c64d0d0b
dshow: indent
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-09-12 19:22:13 +02:00
1c282f96ab
dshow: add option to list devices
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-09-12 19:22:10 +02:00
fad4e1a572
dshow: factorise cycling through devices
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-09-12 19:22:06 +02:00
4381bddc9f
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.
2011-09-12 18:51:46 +02:00
2c0317419b
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.
2011-09-12 18:51:18 +02:00
47886e3644
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
2011-09-12 18:17:49 +02:00
7321163011
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.
2011-09-12 18:17:43 +02:00
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
57650c70e2
doc/avconv: fix typo.
2011-09-12 15:53:26 +02:00
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
47a8589f7b
smacker demuxer: handle possible av_realloc() failure.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 15:51:21 +02:00
677a831ec6
ffmpeg: remove unused data_codec_name.
2011-09-12 12:09:09 +02:00
525d4852b9
ffmpeg: set {audio,video,subtitle}_codec_name const.
...
This fixes "assignment discards ‘const’ qualifier from pointer target
type." warnings.
2011-09-12 12:09:08 +02:00
4b961ddfea
ffmpeg: a bit more consistent prototypes.
2011-09-12 11:52:55 +02:00
615baa13e4
lavfi: add split filter from soc.
...
Some fixes by Stefano.
For detailed authorship see SOC repo
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 08:48:16 +02:00
ee42716b07
lavfi: add showinfo filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 08:48:14 +02:00
af1e247038
libxavs: add private options corresponding to deprecated global options
...
Code mostly copied from libx264 wrapper.
2011-09-12 08:45:55 +02:00
83a0caad84
alsa: increase max buffer size
...
Fixes Ticket373
Thanks to llogan for testing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 06:16:40 +02:00
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
ad2fba8619
doc: replace avserver by ffserver as we have not done that rename
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 06:07:58 +02:00
7e4111cfe2
rmdec: Check return value of more avio_seek calls
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 04:39:13 +02:00
f9e083a156
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>
2011-09-12 04:39:12 +02:00
ac1d489320
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>
2011-09-12 04:39:12 +02:00
bc851a2946
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>
2011-09-12 04:39:12 +02:00
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
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
5a6f4a1302
gitignore: add files to git ignore generated on a win32 build
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11 21:42:54 +02:00
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
d0121e8d96
Fixed segfault on corrupted smacker streams in the demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11 21:19:45 +02:00
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
1632a576e6
Fixed segfault on memory allocation failure in ape demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11 21:19:45 +02:00
c8ce2b0a1d
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>
2011-09-11 20:21:47 +02:00
6cfed11270
audioconvert: add explanatory comments to channel_names array
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-09-11 18:41:34 +02:00
3a0b5fa5e8
audioconvert: K&R whitespace cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-09-11 18:41:33 +02:00
53f8f0a70e
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>
2011-09-11 18:21:07 +02:00
e42a3dd123
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.
2011-09-11 17:44:20 +02:00
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
4bb3ae1eaa
avconv: use correct index when selecting metadata to write to.
2011-09-11 17:30:05 +02:00
f39ecc79aa
avconv: fix inverted variable
2011-09-11 17:30:05 +02:00
172efad7c7
doc/avconv: document option types (input/output/per-stream/...)
...
Also trim some redundant stream specifiers descriptions.
2011-09-11 17:30:05 +02:00
99442bfe20
doc/avtools-common-opts: write a section about stream specifiers.
2011-09-11 17:30:05 +02:00
3a37392efe
doc/avconv: remove two pointless paragraphs.
...
They are misleading and carry no useful information.
2011-09-11 17:30:04 +02:00
eb05446367
doc/avconv: document that global options should be specified first.
2011-09-11 17:30:04 +02:00
d3d6a2582e
doc/avconv: remove entries for nonexistent options
2011-09-11 17:30:04 +02:00
1533c10286
doc/avconv: remove documentation for removed 'timestamp' option
2011-09-11 17:30:04 +02:00
b3dd2010af
doc: cosmetics, rename fftools-common-opts to avtools-....
2011-09-11 17:30:04 +02:00
495ecfd139
avconv: move streamid_map to options context.
2011-09-11 17:30:04 +02:00
8e5ce5901b
avconv: extend -vf syntax
...
Add a per-stream -filter option, make -vf an alias for -filter:v. Move
vfilters to the options context.
2011-09-11 17:30:04 +02:00
Joakim Plate
Michael Niedermayer
Ramiro Polla
Stefano Sabatini
Philip de Nier
Hendrik Leppkes
Justin Ruggles
Anton Khirnov
Kostya Shishkov
Clément Bœsch
Bobby Bingham
Laurent Aimar