OSDN Git Service
yukihane [Mon, 12 Sep 2011 10:44:41 +0000 (19:44 +0900)]
Merge remote branch 'official/master'
Conflicts:
ffmpeg.c
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>
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