Michael Niedermayer
fbbe092568
ffplay: remove thread command line option code, it is unneeded for -threads X to work.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-13 15:05:42 +02:00
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
Carl Eugen Hoyos
391b1e3911
Fix false positive when detecting dxva2.
2011-09-13 10:11:16 +02:00
Michael Niedermayer
38670356f9
libavformat/utils: print ts in the "invalid dts/pts combination" case.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-13 06:42:13 +02:00
Michael Niedermayer
39e0accb7a
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>
2011-09-13 03:52:30 +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
Laurent Aimar
a92d0fa5d2
Fixed off by one packet size allocation in the smacker demuxer.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-09-12 23:44:51 +03:00
Laurent Aimar
e055932f56
Check for invalid packet size in the smacker demuxer.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-09-12 23:43:52 +03: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
Joakim Plate
6c9a24636b
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>
2011-09-12 22:12:14 +02:00
Stefano Sabatini
9efae6a161
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 2c0317419b
)
and
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
(commit 4381bddc9f
)
2011-09-12 22:08:53 +02:00
Laurent Aimar
c58d45e004
segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 21:45:23 +02:00
Laurent Aimar
7cbe025758
segafilm: Check for memory allocation failures in segafilm demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 21:45:07 +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
Laurent Aimar
273aab99bf
ape demuxer: fix segfault on memory allocation failure.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 21:12:31 +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
Alex Converse
0872bb23b4
xan: Add some buffer checks
2011-09-12 11:18:57 -07:00
Alex Converse
350f57bd7b
xan: Remove extra trailing newline
2011-09-12 11:18:57 -07:00
Laurent Aimar
393d5031c6
Fixed size given to init_get_bits() in xan decoder.
2011-09-12 11:18:57 -07:00
Ramiro Polla
f0c64d0d0b
dshow: indent
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-09-12 19:22:13 +02:00
Ramiro Polla
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
Ramiro Polla
fad4e1a572
dshow: factorise cycling through devices
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-09-12 19:22:06 +02:00
Stefano Sabatini
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
Stefano Sabatini
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
Philip de Nier
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
Hendrik Leppkes
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
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
Anton Khirnov
57650c70e2
doc/avconv: fix typo.
2011-09-12 15:53:26 +02: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
Kostya Shishkov
47a8589f7b
smacker demuxer: handle possible av_realloc() failure.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 15:51:21 +02:00
Clément Bœsch
677a831ec6
ffmpeg: remove unused data_codec_name.
2011-09-12 12:09:09 +02:00
Clément Bœsch
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
Clément Bœsch
4b961ddfea
ffmpeg: a bit more consistent prototypes.
2011-09-12 11:52:55 +02:00
Bobby Bingham
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
Stefano Sabatini
ee42716b07
lavfi: add showinfo filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-12 08:48:14 +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
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
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
Michael Niedermayer
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
Joakim Plate
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
Joakim Plate
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
Joakim Plate
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
Laurent Aimar
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
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
Joakim Plate
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
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