Anton Khirnov [Sun, 11 Sep 2011 10:27:51 +0000 (12:27 +0200)]
Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
This reverts commit
2cf8355f98681bdd726b739008acd5483f82f8d7.
AVInputStream.nb_streams tracks number of streams found at the
beginning, new streams may appear that ffmpeg doesn't know about. Fixes
crash in this case.
Anton Khirnov [Thu, 1 Sep 2011 15:01:53 +0000 (17:01 +0200)]
Remove some forgotten AVCodecContext.palctrl usage.
Anton Khirnov [Thu, 1 Sep 2011 14:59:35 +0000 (16:59 +0200)]
lavc/utils: move avcodec_init() higher in the file.
Fixes build on next major bump.
Anton Khirnov [Thu, 1 Sep 2011 14:57:20 +0000 (16:57 +0200)]
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
Anton Khirnov [Thu, 1 Sep 2011 14:48:29 +0000 (16:48 +0200)]
ac3dec: actually use drc_scale private option
Anton Khirnov [Thu, 1 Sep 2011 14:40:18 +0000 (16:40 +0200)]
lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
They are still being used and shouldn't be removed.
Anton Khirnov [Thu, 1 Sep 2011 14:31:02 +0000 (16:31 +0200)]
alsa: add missing header
Fixes compile with next lavc major.
Diego Biurrun [Tue, 20 Sep 2011 07:10:41 +0000 (09:10 +0200)]
msmpeg4: remove leftover unused debug variable declaration
Diego Biurrun [Tue, 13 Sep 2011 15:00:41 +0000 (17:00 +0200)]
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
This fixes build failures with -DDEBUG in CPPFLAGS.
Diego Biurrun [Tue, 13 Sep 2011 15:00:16 +0000 (17:00 +0200)]
Fix av_dlog invocations with wrong or missing logging context.
This fixes build failures with -DDEBUG in CPPFLAGS.
Stefano Sabatini [Sat, 27 Aug 2011 16:32:14 +0000 (18:32 +0200)]
vf_yadif: add support to yuva420p
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Wed, 3 Aug 2011 22:25:35 +0000 (00:25 +0200)]
vf_yadif: correct documentation on the parity parameter
0 is top-field-first, 1 is bottom-field-first, not the other way
around.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Joakim Plate [Thu, 14 Jul 2011 20:31:37 +0000 (22:31 +0200)]
vf_yadif: copy buffer properties like aspect for second frame as well
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Sun, 18 Sep 2011 19:58:09 +0000 (21:58 +0200)]
oma: support for encrypted files
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Sun, 18 Sep 2011 16:04:34 +0000 (18:04 +0200)]
id3v2: add support for non-text and GEOB type tag frames
This extends the ID3v2 parser to allow for reading of non-text (i.e.
other than T***) meta tag frames providing a ff_id3v2_read_all()
function. An additional data structure 'ID3v2ExtraMeta' is introduced
for these tags since AVDictionary is string oriented and unsuitable
for binary data.
A parser for tag frames of type GEOB is implemented, which is needed
to extract keyring information from encrypted OMA files. GEOB data
is parsed into 'ID3v2ExtraMetaGEOB' data structures.
The routine to decode characters from different encodings to UTF-8,
formerly part of the read_ttag() function, is moved to its own
function. Because some tag frames contain subparts of unknown length,
the function is now also able to read until a null character is found.
In addition, the function now takes care of allocating a buffer long
enough to hold the decoded characters.
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Fri, 2 Sep 2011 06:20:58 +0000 (08:20 +0200)]
des: add possibility to calculate DES-CBC-MAC with small buffer
This patch adds the possibility to calculate the DES-CBC-MAC of a
source buffer (i.e. the last block of the buffer encrypted in CBC
mode) without having to allocate a destination buffer that is as
long as the complete source buffer, but instead only 8 bytes
for the MAC.
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Tue, 20 Sep 2011 13:00:52 +0000 (16:00 +0300)]
rtmp: Don't blindly skip the 4 trailer bytes from the FLV packets
If not enough bytes are available, keep track of them and skip
them on next call.
In practice, if these trailer bytes are written in a separate
call, there is no other data written in this call, making it
fall into the "FLV packet too small" case currently - working,
but not as intended.
This patch makes the code more robust, handling all cases
except for having the FLV packet header split over multiple
write calls.
Signed-off-by: Martin Storsjö <martin@martin.st>
Chiranjeevi Melam [Sun, 18 Sep 2011 03:39:53 +0000 (05:39 +0200)]
rtmp: Handle FLV packets written in more than one write call
If the FLV packet is larger than the AVIO buffer, a partial
FLV packet will be flushed to the RTMP protocol.
This commit handles the most common cases of FLV packets
being written in more than one call.
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Mon, 19 Sep 2011 20:48:53 +0000 (22:48 +0200)]
rv34: Check for invalid slice offsets
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Mon, 19 Sep 2011 13:15:56 +0000 (15:15 +0200)]
movenc: fix NULL reference in mov_write_tkhd_tag
st may be NULL when there are more mov streams than AVStreams, e.g. when
chapters are present.
Laurent Aimar [Fri, 16 Sep 2011 22:05:13 +0000 (00:05 +0200)]
rmdec: Reject invalid deinterleaving parameters
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Sat, 17 Sep 2011 14:56:30 +0000 (16:56 +0200)]
rv34: Fix potential overreads
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Sat, 17 Sep 2011 14:56:36 +0000 (16:56 +0200)]
rv34: Fix buffer size used for MC of B frames after a resolution change
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Sat, 17 Sep 2011 21:43:58 +0000 (23:43 +0200)]
rv34: Avoid NULL dereference on corrupted bitstream
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Sat, 17 Sep 2011 22:03:08 +0000 (00:03 +0200)]
rv10: Reject slices that does not have the same type as the first one
This prevents crashes with some corrupted bitstreams.
Signed-off-by: Martin Storsjö <martin@martin.st>
Joakim Plate [Sun, 3 Jul 2011 11:19:44 +0000 (13:19 +0200)]
vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
Signed-off-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Fri, 17 Jun 2011 23:47:37 +0000 (01:47 +0200)]
vsrc_color: set output pos values to -1
-1 is more correct than 0, as the position in the file is undefined.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Fri, 17 Jun 2011 23:46:27 +0000 (01:46 +0200)]
vsrc_color: add @file doxy
Also remove outdated reference to color in vf_pad.c.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Wed, 25 May 2011 07:37:25 +0000 (09:37 +0200)]
vsrc_buffer: remove duplicated file description
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Mon, 23 May 2011 11:13:50 +0000 (13:13 +0200)]
eval: implement not() expression
Stefano Sabatini [Tue, 3 May 2011 21:31:14 +0000 (23:31 +0200)]
eval: add sqrt function for computing the square root
Laurent Aimar [Sat, 17 Sep 2011 21:17:45 +0000 (21:17 +0000)]
rmdec: use the deinterleaving mode and not the codec when creating audio packets.
It prevents crashes due to non initialized fields.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
David Goldwich [Sat, 17 Sep 2011 11:50:35 +0000 (13:50 +0200)]
lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 18 Sep 2011 06:55:01 +0000 (08:55 +0200)]
doc/APIChanges: fill in missing hashes and dates.
Stefano Sabatini [Sat, 7 May 2011 00:06:25 +0000 (02:06 +0200)]
lavfi: add select filter
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Laurent Aimar [Sun, 11 Sep 2011 21:26:12 +0000 (23:26 +0200)]
oggdec: fix out of bound write in the ogg demuxer
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Anton Khirnov [Fri, 16 Sep 2011 14:06:45 +0000 (16:06 +0200)]
movenc: create an alternate group for each media type
Partially fixes bug 44.
Anton Khirnov [Tue, 13 Sep 2011 15:23:06 +0000 (17:23 +0200)]
lavd: add libcdio-paranoia input device for audio CD grabbing
Anton Khirnov [Wed, 14 Sep 2011 12:03:55 +0000 (14:03 +0200)]
rawdec: refactor private option for raw video demuxers
pixel_format/video_size only apply to 'rawvideo' (==uncompressed) demuxer
and make no sense for the other raw (== containerless) demuxers. Keep
only the framerate option for those.
Also use unique classes for all raw video demuxers
Anton Khirnov [Wed, 14 Sep 2011 07:54:29 +0000 (09:54 +0200)]
pcmdec: use unique classes for all pcm demuxers.
Anton Khirnov [Wed, 14 Sep 2011 06:55:27 +0000 (08:55 +0200)]
rawdec: g722 is always 1 channel/16kHz
Luca Barbato [Fri, 16 Sep 2011 02:30:10 +0000 (04:30 +0200)]
libx264: introduce slice-max-size option
Yet another option useful for low latency streaming.
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: Alex Converse <alex.converse@gmail.com>
Ronald S. Bultje [Thu, 15 Sep 2011 14:30:34 +0000 (07:30 -0700)]
swscale: fix byte overreads in SSE-optimized hscale().
SSE-optimized hScale() scales up to 4 pixels at once, so we need to
allocate up to 3 padding pixels to prevent overreads. This fixes
valgrind errors in various swscale-tests on fate.
Dustin Brody [Thu, 15 Sep 2011 07:34:38 +0000 (09:34 +0200)]
matroskadec: fix typo.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Dustin Brody [Thu, 8 Sep 2011 22:43:32 +0000 (18:43 -0400)]
matroskadec: bail on parsing of incorrect seek index segments
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alex Converse [Tue, 13 Sep 2011 22:27:01 +0000 (15:27 -0700)]
lavf utils: Remove write-only variable
Alex Converse [Tue, 13 Sep 2011 22:26:25 +0000 (15:26 -0700)]
lavf utils: Rename shadowing variable
Michael Niedermayer [Tue, 13 Sep 2011 21:24:56 +0000 (23:24 +0200)]
smacker: fix a few off by 1 errors
stereo & 16bit is untested due to lack of samples
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Mon, 12 Sep 2011 21:49:36 +0000 (23:49 +0200)]
Check for invalid VLC value in smacker decoder.
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Mon, 12 Sep 2011 21:46:49 +0000 (23:46 +0200)]
Check and propagate errors when VLC trees cannot be built in smacker decoder.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Tue, 13 Sep 2011 16:53:42 +0000 (09:53 -0700)]
sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
Speed: from 3.9x to 9.6x speed improvement over C, and some small
(up to 15%) speed improvements over existing MMX code (particularly
for bigger filters).
Justin Ruggles [Tue, 13 Sep 2011 14:59:47 +0000 (10:59 -0400)]
include stdint.h in adpcm_data.h
fixes make checkheaders
Diego Biurrun [Thu, 8 Sep 2011 17:19:18 +0000 (19:19 +0200)]
mpeg12: reorder functions to avoid ugly forward declarations
Laurent Aimar [Mon, 12 Sep 2011 18:50:34 +0000 (20:50 +0200)]
Fixed off by one packet size allocation in the smacker demuxer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Mon, 12 Sep 2011 18:50:13 +0000 (20:50 +0200)]
Check for invalid packet size in the smacker demuxer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Laurent Aimar [Sun, 11 Sep 2011 17:17:40 +0000 (19:17 +0200)]
ape demuxer: fix segfault on memory allocation failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alex Converse [Fri, 9 Sep 2011 23:10:03 +0000 (16:10 -0700)]
xan: Add some buffer checks
Alex Converse [Fri, 9 Sep 2011 23:13:52 +0000 (16:13 -0700)]
xan: Remove extra trailing newline
Laurent Aimar [Fri, 9 Sep 2011 22:32:12 +0000 (00:32 +0200)]
Fixed size given to init_get_bits() in xan decoder.
Justin Ruggles [Wed, 7 Sep 2011 22:34:09 +0000 (18:34 -0400)]
adpcm: split ADPCM encoders and decoders into separate files.
Move shared tables to a separate file as well.
Anton Khirnov [Mon, 12 Sep 2011 08:40:43 +0000 (10:40 +0200)]
doc/avconv: fix typo.
Kostya Shishkov [Mon, 12 Sep 2011 09:39:53 +0000 (11:39 +0200)]
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>
Kostya Shishkov [Mon, 12 Sep 2011 07:40:42 +0000 (09:40 +0200)]
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Bobby Bingham [Sat, 21 May 2011 14:46:11 +0000 (16:46 +0200)]
lavfi: add split filter from soc.
Some fixes by Stefano.
For detailed authorship see SOC repo
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sat, 23 Apr 2011 18:55:34 +0000 (20:55 +0200)]
lavfi: add showinfo filter
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 11 Sep 2011 06:14:43 +0000 (08:14 +0200)]
libxavs: add private options corresponding to deprecated global options
Code mostly copied from libx264 wrapper.
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>
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>
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.
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>
Anton Khirnov [Thu, 1 Sep 2011 06:20:50 +0000 (08:20 +0200)]
avconv: move audio_channels to the options context.