OSDN Git Service
Alex Converse [Wed, 21 Mar 2012 17:58:07 +0000 (10:58 -0700)]
xwma: Validate channels and bits_per_coded_sample.
This prevents a SIGFPE later on.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Alex Converse [Wed, 21 Mar 2012 18:24:10 +0000 (11:24 -0700)]
mov: Do not read past the end of the ctts_data table.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Alex Converse [Wed, 21 Mar 2012 16:35:45 +0000 (09:35 -0700)]
mov: Add missing terminator to mov_ch_layout_map_1ch.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: Libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 23:10:37 +0000 (16:10 -0700)]
asf: reset side data elements on packet copy.
Prevents crash (double free) when free()ing the original packet.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 22:47:11 +0000 (15:47 -0700)]
wmavoice: fix stack overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 22:43:03 +0000 (15:43 -0700)]
wmalossless: error out if a subframe is not used by any channel.
Prevents infinite loop because min_channel_len never increments.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 22:19:31 +0000 (15:19 -0700)]
vqa: check palette chunk size before reading data.
Prevents overreads beyond buffer boundaries.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 22:02:19 +0000 (15:02 -0700)]
wmalossless: reset sample pointer for each subframe.
Prevents overwrites when some subframes only encode some channels.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Ronald S. Bultje [Wed, 21 Mar 2012 19:40:59 +0000 (12:40 -0700)]
wmalossless: error out on invalid values for order.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Derek Buitenhuis [Mon, 19 Mar 2012 22:23:42 +0000 (18:23 -0400)]
FATE: Add ZeroCodec test
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 8 Mar 2012 20:11:37 +0000 (21:11 +0100)]
oggparseogm: fix order of arguments of avpriv_set_pts_info().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 21 Mar 2012 08:48:26 +0000 (09:48 +0100)]
pngenc: better upper bound for encoded frame size.
Fixes encoding very large pictures.
Thanks to Костя for providing the formula.
Justin Ruggles [Wed, 21 Mar 2012 18:51:50 +0000 (14:51 -0400)]
aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
Justin Ruggles [Wed, 21 Mar 2012 18:48:35 +0000 (14:48 -0400)]
aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
Justin Ruggles [Wed, 21 Mar 2012 18:36:33 +0000 (14:36 -0400)]
aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
Justin Ruggles [Wed, 21 Mar 2012 18:30:33 +0000 (14:30 -0400)]
aiffdec: do not set bit rate if block duration is unknown
CC: libav-stable@libav.org
Kostya Shishkov [Wed, 21 Mar 2012 18:10:43 +0000 (19:10 +0100)]
wmall: output packet only if we have decoded some samples
Also set CODEC_CAP_DELAY to indicate that decoder may still have some
undecoded data left in internal buffer.
Justin Ruggles [Wed, 21 Mar 2012 17:58:09 +0000 (13:58 -0400)]
adxenc: use AVCodec.encode2()
Justin Ruggles [Wed, 21 Mar 2012 17:30:37 +0000 (13:30 -0400)]
adxenc: Use the AVFrame in ADXContext for coded_frame
Ronald S. Bultje [Wed, 21 Mar 2012 17:39:10 +0000 (10:39 -0700)]
indeo4: fix out-of-bounds function call.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diego Biurrun [Thu, 8 Mar 2012 23:24:48 +0000 (00:24 +0100)]
configure: Restructure help output.
Break some of the longer sections into smaller sensible pieces;
make some option descriptions and option ordering more consistent.
Diego Biurrun [Thu, 8 Mar 2012 22:53:57 +0000 (23:53 +0100)]
configure: Internal-only components should not be command-line selectable.
Justin Ruggles [Wed, 29 Feb 2012 08:16:24 +0000 (03:16 -0500)]
vorbisenc: use AVCodec.encode2()
Justin Ruggles [Wed, 29 Feb 2012 06:02:54 +0000 (01:02 -0500)]
libvorbis: use AVCodec.encode2()
Justin Ruggles [Tue, 28 Feb 2012 07:51:29 +0000 (02:51 -0500)]
libopencore-amrnbenc: use AVCodec.encode2()
Justin Ruggles [Tue, 28 Feb 2012 06:48:31 +0000 (01:48 -0500)]
ra144enc: use AVCodec.encode2()
Justin Ruggles [Tue, 28 Feb 2012 05:08:11 +0000 (00:08 -0500)]
nellymoserenc: use AVCodec.encode2()
Justin Ruggles [Tue, 28 Feb 2012 01:53:09 +0000 (20:53 -0500)]
roqaudioenc: use AVCodec.encode2()
The first frame pts must be saved until we have 8 frames since RoQ audio
requires 8 frames in the first packet.
Justin Ruggles [Tue, 28 Feb 2012 01:01:42 +0000 (20:01 -0500)]
libspeex: use AVCodec.encode2()
Justin Ruggles [Thu, 23 Feb 2012 22:22:42 +0000 (17:22 -0500)]
libvo_amrwbenc: use AVCodec.encode2()
Justin Ruggles [Thu, 23 Feb 2012 06:14:15 +0000 (01:14 -0500)]
libvo_aacenc: use AVCodec.encode2()
Justin Ruggles [Mon, 20 Feb 2012 17:29:14 +0000 (12:29 -0500)]
wmaenc: use AVCodec.encode2()
Justin Ruggles [Sun, 19 Feb 2012 22:12:48 +0000 (17:12 -0500)]
mpegaudioenc: use AVCodec.encode2()
Update FATE references due to encoder delay.
Justin Ruggles [Sun, 19 Feb 2012 18:16:34 +0000 (13:16 -0500)]
libmp3lame: use AVCodec.encode2()
Justin Ruggles [Thu, 16 Feb 2012 00:20:30 +0000 (19:20 -0500)]
libgsmenc: use AVCodec.encode2()
Justin Ruggles [Tue, 7 Feb 2012 19:28:50 +0000 (14:28 -0500)]
libfaac: use AVCodec.encode2()
Encoder output is delayed by several frames, so we keep a queue of input
frame timing info to match up with corresponding output packets.
Justin Ruggles [Sat, 4 Feb 2012 16:36:59 +0000 (11:36 -0500)]
g726enc: use AVCodec.encode2()
Justin Ruggles [Sat, 4 Feb 2012 16:26:33 +0000 (11:26 -0500)]
g722enc: use AVCodec.encode2()
FATE reference updated due timestamp rounding because of resampling from
44100 Hz to 16000 Hz in avconv.
Justin Ruggles [Fri, 3 Feb 2012 23:43:39 +0000 (18:43 -0500)]
flacenc: use AVCodec.encode2()
Justin Ruggles [Tue, 31 Jan 2012 20:54:45 +0000 (15:54 -0500)]
adpcmenc: update to AVCodec.encode2()
Justin Ruggles [Mon, 30 Jan 2012 00:01:10 +0000 (19:01 -0500)]
ac3enc: update to AVCodec.encode2()
Update FATE references due to encoder delay.
Justin Ruggles [Sat, 28 Jan 2012 17:28:01 +0000 (12:28 -0500)]
aacenc: use AVCodec.encode2()
Justin Ruggles [Thu, 23 Feb 2012 02:52:34 +0000 (21:52 -0500)]
avcodec: add code for a frame queue for use by audio encoders with delay
This simplifies matching of timestamps between input frames and output
packets.
Justin Ruggles [Tue, 20 Mar 2012 19:36:28 +0000 (15:36 -0400)]
avconv: free packet in write_frame() when discarding due to frame number limit
Fixes a memleak when using the -frames option with audio.
Justin Ruggles [Tue, 20 Mar 2012 19:10:39 +0000 (15:10 -0400)]
FATE: use +/- flag option syntax for vp8 emu-edge tests
Anton Khirnov [Thu, 15 Mar 2012 12:37:43 +0000 (13:37 +0100)]
lavf: make av_interleave_packet_per_dts() private.
There is no reason for it to be public, it's only meant to be used
internally.
Anton Khirnov [Sun, 4 Mar 2012 20:41:59 +0000 (21:41 +0100)]
lavf: deprecate av_read_packet().
The caller can achieve the same effect (i.e. getting raw unparsed/mangled
packets) with av_read_frame() and AVFMT_FLAG_NOPARSE |
AVFMT_FLAG_NOFILLIN
Justin Ruggles [Fri, 24 Feb 2012 02:40:14 +0000 (21:40 -0500)]
oggdec: output correct timestamps for Vorbis
Takes encoder delay into account by comparing first the coded page
duration with the calculated page duration. Handles last packet duration
if needed, also by comparing coded duration with calculated duration.
Also does better handling of timestamp generation for packets in the
first page for streamed ogg files where the start time is not
necessarily zero.
Justin Ruggles [Thu, 1 Mar 2012 18:02:49 +0000 (13:02 -0500)]
avconv: pass input stream timestamps to audio encoders
5 FATE test references updated due to using demuxer-generated timestamps that
are either not sample-accurate or are slightly off in the input file.
Justin Ruggles [Tue, 20 Mar 2012 17:21:52 +0000 (13:21 -0400)]
lavc: shrink encoded audio packet size after encoding.
Justin Ruggles [Tue, 20 Mar 2012 16:13:15 +0000 (12:13 -0400)]
xa: set correct bit rate
Also fixes stream duration calculation.
Justin Ruggles [Tue, 20 Mar 2012 16:00:00 +0000 (12:00 -0400)]
xa: do not set bit_rate, block_align, or bits_per_coded_sample
The values in the header refer to decoded data, not compressed data.
Justin Ruggles [Tue, 20 Mar 2012 15:53:56 +0000 (11:53 -0400)]
xa: fix end-of-file handling
Do not output an extra packet when out_size is reached.
Also return AVERROR_EOF instead of AVERROR(EIO).
Justin Ruggles [Tue, 20 Mar 2012 15:20:54 +0000 (11:20 -0400)]
xa: fix timestamp calculation
The packet duration is always 28 samples.
Kostya Shishkov [Tue, 20 Mar 2012 17:43:00 +0000 (18:43 +0100)]
bink: fix typo in FFALIGN() argument
Kostya Shishkov [Tue, 20 Mar 2012 06:53:41 +0000 (07:53 +0100)]
bink: align plane width to 8 when calculating bundle sizes
This fixes decoding of Bink files with non-multiple-of-16 width.
Mans Rullgard [Tue, 20 Mar 2012 10:54:02 +0000 (10:54 +0000)]
doc: pass -Idoc texi2html and texi2pod
This fixes doc generation in build tree separate from source.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 20 Mar 2012 10:53:06 +0000 (10:53 +0000)]
doc: texi2pod: add -I flag
This allows specifying additional directories to search for
@include files.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Martin Storsjö [Mon, 19 Mar 2012 17:31:15 +0000 (19:31 +0200)]
movenc: Add a min_frag_duration option
The other fragmentation options (frag_duration, frag_size and
frag_keyframe) are combined with OR, cutting fragments at the
first of the conditions being fulfilled.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 19 Mar 2012 18:40:23 +0000 (20:40 +0200)]
rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
This enables reordering of UDP packets by default, unless the caller
explicitly sets -max_delay 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 19 Mar 2012 18:37:10 +0000 (20:37 +0200)]
libavformat: Set the default for the max_delay option to -1
Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.
This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Wed, 14 Mar 2012 19:08:50 +0000 (20:08 +0100)]
Generate manpages for AV{Format,Codec}Context AVOptions.
Anton Khirnov [Thu, 15 Mar 2012 07:17:05 +0000 (08:17 +0100)]
doc/avconv: remove entries for AVOptions.
Documentation for those will be generated automatically.
Anton Khirnov [Wed, 14 Mar 2012 12:18:20 +0000 (13:18 +0100)]
Move AVFormatContext/AVCodecContext option tables to separate files.
This will allow us to automatically generate manpages for them.
Anton Khirnov [Sun, 18 Mar 2012 16:35:49 +0000 (17:35 +0100)]
lavf: use AVStream.discard to disable queueing attached pictures.
Anton Khirnov [Sun, 18 Mar 2012 16:34:14 +0000 (17:34 +0100)]
lavf: requeue attached pictures after seeking.
This allows the caller to get them without special code even after
seeking before receiving any data.
Anton Khirnov [Sun, 18 Mar 2012 16:29:52 +0000 (17:29 +0100)]
id3v2: set the keyframe flag on attached pictures.
Paul B Mahol [Sun, 18 Mar 2012 21:04:08 +0000 (21:04 +0000)]
FATE: change fate-maxis-xa to a normal demuxing test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Paul B Mahol [Sun, 18 Mar 2012 19:50:20 +0000 (19:50 +0000)]
FATE: add test for adpcm-ea-maxis-xa
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Aaron Colwell [Mon, 19 Mar 2012 03:03:00 +0000 (20:03 -0700)]
vp8: avoid race condition on segment map.
This change avoids accessing the segment map of the previous frame if
segmentation is not enabled for the current frame. The caller of
decode_mb_mode() only calls ff_thread_await_progress() on the reference
segmentation index array if segmentation is enabled, so Chromium's TSAN
will report a race when accessing this data while segmentation is not
enabled.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Kostya Shishkov [Mon, 19 Mar 2012 18:11:24 +0000 (19:11 +0100)]
fix space type in Changelog
Derek Buitenhuis [Sun, 18 Mar 2012 19:04:38 +0000 (15:04 -0400)]
ZeroCodec Decoder
An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Kostya Shishkov [Sat, 17 Mar 2012 07:48:57 +0000 (08:48 +0100)]
RealAudio Lossless decoder
Martin Storsjö [Mon, 19 Mar 2012 11:56:25 +0000 (13:56 +0200)]
rtpenc: Use AVFormatContext.packet_size instead of a private option
The private option has not been part of any release yet (and
it is only of use in quite rare cases), so just remove it instead
of keeping it with deprecation warnings.
Signed-off-by: Martin Storsjö <martin@martin.st>
Nicolas George [Thu, 15 Mar 2012 11:16:54 +0000 (12:16 +0100)]
url: Document the expected behaviour of url_read
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 19 Mar 2012 12:24:04 +0000 (14:24 +0200)]
libavformat: Use AVFormatContext.probesize in init_input
This was forgotten in the transition from av_open_input_file to
avformat_open_input, see
603b8bc2a1.
This doesn't change anything for the default case where the
option isn't set, since PROBE_BUF_MAX is
1048576 (which was
used as max probe size earlier) while the default value for
the probesize option is
5000000, which for the probe function
is clipped to PROBE_BUF_MAX anyway.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 19 Mar 2012 12:21:52 +0000 (14:21 +0200)]
docs: Fix a stray reference to tags in the generic doxy on dicts
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 19 Mar 2012 10:17:47 +0000 (12:17 +0200)]
cosmetics: Align some AVInput/OutputFormat declarations
Also add missing trailing commas.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Sun, 18 Mar 2012 08:11:39 +0000 (09:11 +0100)]
zmbv: check decompress result
Changing flush type from Z_FINISH is needed since encoder compresses fixed
amount of data and doesn't care about writing end of stream marker.
Kostya Shishkov [Sun, 18 Mar 2012 07:48:50 +0000 (08:48 +0100)]
zmbv: correct indentation
Ronald S. Bultje [Sat, 17 Mar 2012 22:43:06 +0000 (15:43 -0700)]
adpcm: convert adpcm_thp to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:39:16 +0000 (15:39 -0700)]
adpcm: convert adpcm_yamaha to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:49 +0000 (15:38 -0700)]
adpcm: convert adpcm_swf to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:10 +0000 (15:38 -0700)]
adpcm: convert adpcm_sbpro to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:33:43 +0000 (15:33 -0700)]
adpcm: convert adpcm_ct to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:32:57 +0000 (15:32 -0700)]
adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:25:03 +0000 (15:25 -0700)]
adpcm: convert adpcm_ea_xas to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:07:03 +0000 (15:07 -0700)]
adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:54:18 +0000 (14:54 -0700)]
adpcm: convert ea_maxis_xa to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:43:20 +0000 (14:43 -0700)]
adpcm: convert adpcm_ea to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:35:26 +0000 (14:35 -0700)]
adpcm convert adpcm_ima_ea_sead to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:39 +0000 (17:06 -0700)]
adpcm: convert adpcm_ima_ea_eacs to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:14 +0000 (17:06 -0700)]
adpcm: convert adpcm_xa to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:17:48 +0000 (14:17 -0700)]
adpcm: convert ima_ws to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:07:20 +0000 (14:07 -0700)]
adpcm: convert adpcm_ima_apc to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:42:17 +0000 (13:42 -0700)]
adpcm: convert adpcm_ima_iss to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:39:54 +0000 (13:39 -0700)]
adpcm: convert adpcm_dk3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:10:19 +0000 (13:10 -0700)]
adpcm: convert adpcm_dk4 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:04:12 +0000 (13:04 -0700)]
adpcm: convert adpcm_ms to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:58:03 +0000 (12:58 -0700)]
adpcm: use av_clip() in adpcm_ima_expand_nibble().