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
Laurent Aimar
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
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
Laurent Aimar
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
Joakim Plate
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
Stefano Sabatini
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
Stefano Sabatini
3a0b5fa5e8
audioconvert: K&R whitespace cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-09-11 18:41:33 +02:00
Joakim Plate
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
Joakim Plate
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
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
4bb3ae1eaa
avconv: use correct index when selecting metadata to write to.
2011-09-11 17:30:05 +02:00
Anton Khirnov
f39ecc79aa
avconv: fix inverted variable
2011-09-11 17:30:05 +02:00
Anton Khirnov
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
Anton Khirnov
99442bfe20
doc/avtools-common-opts: write a section about stream specifiers.
2011-09-11 17:30:05 +02:00
Anton Khirnov
3a37392efe
doc/avconv: remove two pointless paragraphs.
...
They are misleading and carry no useful information.
2011-09-11 17:30:04 +02:00
Anton Khirnov
eb05446367
doc/avconv: document that global options should be specified first.
2011-09-11 17:30:04 +02:00
Anton Khirnov
d3d6a2582e
doc/avconv: remove entries for nonexistent options
2011-09-11 17:30:04 +02:00
Anton Khirnov
1533c10286
doc/avconv: remove documentation for removed 'timestamp' option
2011-09-11 17:30:04 +02:00
Anton Khirnov
b3dd2010af
doc: cosmetics, rename fftools-common-opts to avtools-....
2011-09-11 17:30:04 +02:00
Anton Khirnov
495ecfd139
avconv: move streamid_map to options context.
2011-09-11 17:30:04 +02:00
Anton Khirnov
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
Anton Khirnov
828e0bcb86
avconv: move top_field_first to options context.
2011-09-11 17:30:04 +02:00
Anton Khirnov
2c2cff16d9
avconv: move inter/intra matrix to options context.
2011-09-11 17:30:04 +02:00
Anton Khirnov
0bc391281a
avconv: remove -psnr option.
...
It's redundant -- -flags +psnr does the same thing.
2011-09-11 17:30:04 +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
Anton Khirnov
0e68c78385
avconv: move video_rc_override_string to options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
b2254d8385
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.
2011-09-11 17:30:03 +02:00
Anton Khirnov
ca46fde792
avconv: move frame aspect ratio to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
d4397b0323
avconv: move frame size to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
91ea4811b3
avconv: move frame_rate to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
bef737a78a
avconv: move force_fps to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
7c0296723c
avconv: move forced_key_frames to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
77d9c4542c
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.
2011-09-11 17:30:03 +02:00
Anton Khirnov
e2469ccf01
avconv: move audio_sample_rate to the options context.
2011-09-11 17:30:03 +02:00
Anton Khirnov
2c474ddbc5
cmdutils: add support for programs in check_stream_specifier()
...
Remove now redundant (and broken/undocumented) opt_programid.
2011-09-11 17:30:01 +02:00
Anton Khirnov
05bffc12c4
avconv: move audio_sample_fmt to options context.
...
Also document it and replace undocumented and inconsistent
'-sample_fmt list' syntax with -sample_fmts.
2011-09-11 17:29:55 +02:00
Georgi Chorbadzhiyski
f1f15c3c1a
mpegts: improve error reporting
...
When reporting continuity error show pid, expected and received cc.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-09-11 09:27:13 -04:00
Aviad Rozenhek
162f1fbc14
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>
2011-09-11 09:26:21 -04: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
0c0ec4be6b
ffmpeg: dont copy duration when -t is used
...
Fixes Ticket445
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11 05:24:26 +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
Compn
28ccda7823
add libspeex encoder change
2011-09-10 22:42:11 -04: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
c975cfaef2
build: fix install rule with --progs-suffix.
2011-09-11 01:48:29 +02:00
Clément Bœsch
754d7f23ee
Fix compilation with --disable-everything --enable-muxer=dv
2011-09-11 01:48:29 +02:00