ffmpeg.git
7 years agolavc/utils: merge side data after video encode.
Clément Bœsch [Thu, 18 Apr 2013 15:19:37 +0000 (17:19 +0200)]
lavc/utils: merge side data after video encode.

This allows encoders to communicate side data to the muxers.

7 years agofate/gif: create meaningful gif encoding tests.
Clément Bœsch [Thu, 18 Apr 2013 16:51:16 +0000 (18:51 +0200)]
fate/gif: create meaningful gif encoding tests.

7 years agomxfdec: fix return variable type for avio_seek
Marton Balint [Wed, 10 Apr 2013 23:09:41 +0000 (01:09 +0200)]
mxfdec: fix return variable type for avio_seek

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix multithreaded MPEG-4 decoding.
Reimar Döffinger [Thu, 18 Apr 2013 17:11:04 +0000 (19:11 +0200)]
Fix multithreaded MPEG-4 decoding.

Regression since c10d498bfd246a40cc7830838b74e18a79418839.
Unfortunately ff_thread_get_format can only be called from
a separate decode thread, running it during init will fail.
Fixes for that are welcome, for now just revert back to
calling avctx->get_format directly, which is correct
but having to decide on a case-by-case basis which approach
to use is a bit messy.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 18 Apr 2013 23:02:17 +0000 (01:02 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: make -aspect work with -vcodec copy.
  lavfi/vf_aspect: improve compatibility of parsing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: Dont stop probing before the whole id3 tag is read
Michael Niedermayer [Thu, 18 Apr 2013 21:10:46 +0000 (23:10 +0200)]
avformat: Dont stop probing before the whole id3 tag is read

When a file appears to start with a id3 tag and appears to
also be something else, then try to increase the probe buffer
size if its below its limit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/mptestsrc: fix invalid access in case of negative linesize
Stefano Sabatini [Wed, 17 Apr 2013 20:11:21 +0000 (22:11 +0200)]
lavfi/mptestsrc: fix invalid access in case of negative linesize

In particular, fix crash with:
ffplay -f lavfi mptestsrc,vflip

7 years agosubtitles: introduce ASS codec id and use it.
Clément Bœsch [Thu, 3 Jan 2013 02:06:43 +0000 (03:06 +0100)]
subtitles: introduce ASS codec id and use it.

Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".

In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".

Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.

Some insight about what is changed or unchanged in this commit:

  CODECS
  ------

  - the decoding process still writes "SSA lines" markup inside the ass
    fields of the subtitles rectangles (sub->rects[n]->ass), which is
    still the current common way of representing decoded subtitles
    markup. It is meant to change later.

  - new ASS codec id: AV_CODEC_ID_ASS (which is different from the
    legacy AV_CODEC_ID_SSA)

  - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
    "ass") for consistency with the codec id and allows to add a real
    ass decoder. This ass decoder receives clean ASS lines (so it starts
    with a ReadOrder, is followed by the Layer, etc). We make sure this
    is decoded properly in a new ass-line rectangle of the decoded
    subtitles (the ssa decoder OTOH is doing a simple straightforward
    copy). Using the packet timing instead of data string makes sure the
    ass-line now contains the appropriate timing.

  - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
    into "ssa" (instead of "ass") for consistency with the codec id, and
    allows to add a real "ass" encoder.

    One important thing about this encoder is that it only supports one
    ass rectangle: we could have put several dialogue events in the
    AVPacket (separated by a \0 for instance) but this would have cause
    trouble for the muxer which needs not only the start time, but also
    the duration: typically, you have merged events with the same start
    time (stored in the AVPacket->pts) but a different duration. At the
    moment, only the matroska do the merge with the SSA-line codec.

    We will need to make sure all the decoders in the future can't add
    more than one rectangle (and only one Dialogue line in it
    obviously).

  FORMATS
  -------

  - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
    In the case of ASS packets as input, it adds the timing based on the
    AVPacket pts and duration, and mux it with "Dialogue:", trailing
    CRLF, etc.

  - lavf/assdec: unchanged; it currently still only outputs SSA-lines
    packets.

  - lavf/mkv: the demuxer can now output ASS packets without the need of
    any "SSA-lines" reconstruction hack. It will become the default at
    next libavformat bump, and the SSA support will be dropped from the
    demuxer. The muxer can take ASS packets since it's muxed normally,
    and still supports the old SSA packets. All the SSA support and
    hacks in Matroska code will be dropped at next lavf bump.

[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html

7 years agoffmpeg: make -aspect work with -vcodec copy.
Nicolas George [Tue, 9 Apr 2013 09:21:47 +0000 (11:21 +0200)]
ffmpeg: make -aspect work with -vcodec copy.

7 years agolavfi/vf_aspect: improve compatibility of parsing.
Nicolas George [Thu, 18 Apr 2013 10:52:20 +0000 (12:52 +0200)]
lavfi/vf_aspect: improve compatibility of parsing.

Try to accept both the old "num:den" and the new "num/den"
syntax. Fix "aspect=2" being ignored due to a missing den.

Also remove a duplicated #include.

7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 18 Apr 2013 18:15:44 +0000 (20:15 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  examples/filtering_audio: fix frame leak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mpegvideo_motion: Check P field references
Michael Niedermayer [Thu, 18 Apr 2013 17:53:00 +0000 (19:53 +0200)]
avcodec/mpegvideo_motion: Check P field references

If a reference is unavailable use a field from the current
picture
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq3: use memmove to avoid overlap in memcpy.
Michael Niedermayer [Thu, 18 Apr 2013 15:54:54 +0000 (17:54 +0200)]
svq3: use memmove to avoid overlap in memcpy.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocolorchannelmixer filter
Paul B Mahol [Mon, 15 Apr 2013 16:56:29 +0000 (16:56 +0000)]
colorchannelmixer filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocolorbalance filter
Paul B Mahol [Sun, 14 Apr 2013 22:16:51 +0000 (22:16 +0000)]
colorbalance filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexamples/filtering_audio: fix frame leak.
Nicolas George [Thu, 18 Apr 2013 13:15:22 +0000 (15:15 +0200)]
examples/filtering_audio: fix frame leak.

The frame is not used after being added to the filter
graph, there is no need to keep the reference.

7 years agolavu: add av_clipd_c
Paul B Mahol [Thu, 18 Apr 2013 13:26:23 +0000 (13:26 +0000)]
lavu: add av_clipd_c

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoevrcdec: use memmove() instead of memcpy() when regions can overlap.
Michael Niedermayer [Thu, 18 Apr 2013 14:19:10 +0000 (16:19 +0200)]
evrcdec: use memmove() instead of memcpy() when regions can overlap.

This occurs also with valid files.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/gif: avoid encoding 0x0 images.
Clément Bœsch [Thu, 18 Apr 2013 13:29:44 +0000 (15:29 +0200)]
lavc/gif: avoid encoding 0x0 images.

It seems browsers don't like it very much.

7 years agolavf/gif: support only GIF codec.
Clément Bœsch [Thu, 18 Apr 2013 11:52:13 +0000 (13:52 +0200)]
lavf/gif: support only GIF codec.

7 years agolavf/gif: merge gif_write_{packet,video}.
Clément Bœsch [Thu, 18 Apr 2013 11:19:16 +0000 (13:19 +0200)]
lavf/gif: merge gif_write_{packet,video}.

Avoid a pointless split.

7 years agolavf/gif: trim unnecessarily long netscape ext code.
Clément Bœsch [Thu, 18 Apr 2013 11:01:56 +0000 (13:01 +0200)]
lavf/gif: trim unnecessarily long netscape ext code.

Extension description comments are now placed along the avio calls, the
always defined macro removed, and the always true loop_count check as
well (loop option is bound to 0-65535).

7 years agolavf/gif: remove unused fields.
Clément Bœsch [Thu, 18 Apr 2013 10:55:04 +0000 (12:55 +0200)]
lavf/gif: remove unused fields.

7 years agolavf/gif: simplify streams type checking.
Clément Bœsch [Thu, 18 Apr 2013 10:19:33 +0000 (12:19 +0200)]
lavf/gif: simplify streams type checking.

7 years agocmdutils: make the "-help filter=" output less confusing
Michael Niedermayer [Wed, 17 Apr 2013 12:31:21 +0000 (14:31 +0200)]
cmdutils: make the "-help filter=" output less confusing

Example:
Filter overlay
  Overlay a video source on top of the input.
    Inputs:
       #0: main (video)
       #1: overlay (video)
    Outputs:
       #0: default (video)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix libswscale compilation with --disable-optimizations on x86-32.
Carl Eugen Hoyos [Thu, 18 Apr 2013 10:47:16 +0000 (12:47 +0200)]
Fix libswscale compilation with --disable-optimizations on x86-32.

Fixes ticket #2477.

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 18 Apr 2013 01:00:27 +0000 (03:00 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix pgc compilation with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/bitstream: check codes in ff_init_vlc_sparse()
Michael Niedermayer [Thu, 18 Apr 2013 00:52:41 +0000 (02:52 +0200)]
avcodec/bitstream: check codes in ff_init_vlc_sparse()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/bitstream: Check bits in ff_init_vlc_sparse()
Michael Niedermayer [Thu, 18 Apr 2013 00:47:10 +0000 (02:47 +0200)]
avcodec/bitstream: Check bits in ff_init_vlc_sparse()

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix pgc compilation with --disable-optimizations.
Carl Eugen Hoyos [Thu, 18 Apr 2013 00:20:04 +0000 (02:20 +0200)]
Fix pgc compilation with --disable-optimizations.

-O1 disables dead code elimination on pgc, use -O instead.

7 years agoxan: Check for overlapping copies
Michael Niedermayer [Wed, 17 Apr 2013 22:52:48 +0000 (00:52 +0200)]
xan: Check for overlapping copies

No valid samples i found use such copies

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: hot fix for gif failure.
Clément Bœsch [Wed, 17 Apr 2013 23:41:23 +0000 (01:41 +0200)]
fate: hot fix for gif failure.

7 years agolavf/gif: fix assert in avio API after dfb3231.
Clément Bœsch [Wed, 17 Apr 2013 23:13:17 +0000 (01:13 +0200)]
lavf/gif: fix assert in avio API after dfb3231.

7 years agogif: remove outdated comments.
Clément Bœsch [Wed, 17 Apr 2013 22:43:18 +0000 (00:43 +0200)]
gif: remove outdated comments.

7 years agolavc/gif: return more meaningful error code.
Clément Bœsch [Wed, 17 Apr 2013 22:20:15 +0000 (00:20 +0200)]
lavc/gif: return more meaningful error code.

7 years agolavc/gif: merge two allocation checks.
Clément Bœsch [Wed, 17 Apr 2013 22:19:33 +0000 (00:19 +0200)]
lavc/gif: merge two allocation checks.

7 years agolavf/gif: simplify palette writing.
Clément Bœsch [Wed, 17 Apr 2013 22:17:58 +0000 (00:17 +0200)]
lavf/gif: simplify palette writing.

7 years agogif: reindent after previous commits.
Clément Bœsch [Wed, 17 Apr 2013 22:12:30 +0000 (00:12 +0200)]
gif: reindent after previous commits.

7 years agolavc/gif: crop image when possible.
Clément Bœsch [Wed, 17 Apr 2013 14:19:00 +0000 (16:19 +0200)]
lavc/gif: crop image when possible.

Increase compression when pictures are similar.

-f lavfi testsrc=300: 61M -> 21M

7 years agoCleanse GIF muxer and encoder.
Clément Bœsch [Wed, 17 Apr 2013 02:20:48 +0000 (04:20 +0200)]
Cleanse GIF muxer and encoder.

This commit removes the badly duplicated code between the encoder and
the muxer. That may sound surprising, but the encoder is now responsible
from the encoding of the picture when muxing to a .gif file. It also
does not require anymore a manual user intervention such as a -pix_fmt
rgb24 to work properly. To summarize, output gif are now easier to
generate, code is saner and simpler, and files are smaller (thanks to
the lzw encoding which was unused so far with the default .gif output).
We can certainly make things even better, but this is the first step.

FATE is updated because of the output being produced by the encoder and
not the muxer (no lzw in the muxer), and in the seek test only the size
mismatches.

Fixes Ticket #2262

7 years agolavfi/aspect: apply hot fix for NUM:DEN syntax
Stefano Sabatini [Wed, 17 Apr 2013 21:32:51 +0000 (23:32 +0200)]
lavfi/aspect: apply hot fix for NUM:DEN syntax

7 years agolavfi/setdar: fix num/den swapping in log message
Stefano Sabatini [Wed, 17 Apr 2013 21:25:20 +0000 (23:25 +0200)]
lavfi/setdar: fix num/den swapping in log message

7 years agolavfi/setsar: remove spurious #if FF_API_OLD_FILTER_OPTS around init field
Stefano Sabatini [Wed, 17 Apr 2013 21:19:47 +0000 (23:19 +0200)]
lavfi/setsar: remove spurious #if FF_API_OLD_FILTER_OPTS around init field

7 years agoavutil/intfloat_readwrite: include common.h for isinf()
Michael Niedermayer [Wed, 17 Apr 2013 21:16:05 +0000 (23:16 +0200)]
avutil/intfloat_readwrite: include common.h for isinf()

Solution based on rational.c, which uses isinf() too

This should fix compilation with msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/mptestsrc: remove unused size field
Stefano Sabatini [Wed, 17 Apr 2013 20:01:18 +0000 (22:01 +0200)]
lavfi/mptestsrc: remove unused size field

7 years agolavfi/mptestsrc: use AV_OPT_TYPE_DURATION
Stefano Sabatini [Wed, 17 Apr 2013 20:00:40 +0000 (22:00 +0200)]
lavfi/mptestsrc: use AV_OPT_TYPE_DURATION

Simplify.

7 years agolavfi/mptestsrc: reindent option constants
Stefano Sabatini [Wed, 17 Apr 2013 19:54:53 +0000 (21:54 +0200)]
lavfi/mptestsrc: reindent option constants

7 years agolavfi/testsrc: fix style
Stefano Sabatini [Wed, 17 Apr 2013 19:22:52 +0000 (21:22 +0200)]
lavfi/testsrc: fix style

7 years agolavfi/testsrc: use int in place of unsigned
Stefano Sabatini [Wed, 17 Apr 2013 19:21:10 +0000 (21:21 +0200)]
lavfi/testsrc: use int in place of unsigned

Avoid implicit int->unsigned conversion, causing invalid access in case
of negative linesize.

Fix crash with:
ffplay -f lavfi testsrc,vflip

7 years agolavfi/aspect: extend verbose feedback, show old SAR and DAR values
Stefano Sabatini [Tue, 16 Apr 2013 14:32:32 +0000 (16:32 +0200)]
lavfi/aspect: extend verbose feedback, show old SAR and DAR values

7 years agolavfi/aspect: restore ratio parsing
Stefano Sabatini [Tue, 16 Apr 2013 14:29:41 +0000 (16:29 +0200)]
lavfi/aspect: restore ratio parsing

Allow to set a ratio as "a:b" (with proper escaping), and correctly
honour the max parameter.

7 years agolavfi/select: factorize options definition between select and aselect
Stefano Sabatini [Mon, 15 Apr 2013 19:02:14 +0000 (21:02 +0200)]
lavfi/select: factorize options definition between select and aselect

7 years agolavfi/select: add support for dynamic number of outputs
Stefano Sabatini [Mon, 8 Apr 2013 10:58:56 +0000 (12:58 +0200)]
lavfi/select: add support for dynamic number of outputs

7 years agolavfi/select: make select_frame() return void
Stefano Sabatini [Mon, 15 Apr 2013 16:28:57 +0000 (18:28 +0200)]
lavfi/select: make select_frame() return void

Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).

7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Wed, 17 Apr 2013 19:32:09 +0000 (21:32 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/buffersrc: fix failed requests count.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agora144: Try to fix int16/uint16 warnings from pgc
Michael Niedermayer [Wed, 17 Apr 2013 19:09:06 +0000 (21:09 +0200)]
ra144: Try to fix int16/uint16 warnings from pgc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()
Michael Niedermayer [Wed, 17 Apr 2013 18:40:56 +0000 (20:40 +0200)]
avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()

Should fix pgc warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_lut: fix simplification / off by 1 error
Michael Niedermayer [Wed, 17 Apr 2013 19:18:24 +0000 (21:18 +0200)]
vf_lut: fix simplification / off by 1 error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/stereo3d: fix interleave row output modes
Paul B Mahol [Wed, 17 Apr 2013 17:27:02 +0000 (17:27 +0000)]
lavfi/stereo3d: fix interleave row output modes

Linesizes that did not match output width produced several artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/interlace: remove exec permissions.
Clément Bœsch [Wed, 17 Apr 2013 17:27:33 +0000 (19:27 +0200)]
lavfi/interlace: remove exec permissions.

7 years agolavfi/lut: simplify nested component stepping.
Clément Bœsch [Wed, 17 Apr 2013 10:08:13 +0000 (12:08 +0200)]
lavfi/lut: simplify nested component stepping.

7 years agolavfi/lut: reindent after previous commit.
Clément Bœsch [Wed, 17 Apr 2013 10:16:16 +0000 (12:16 +0200)]
lavfi/lut: reindent after previous commit.

7 years agolavfi/lut: add direct path.
Clément Bœsch [Wed, 17 Apr 2013 10:07:46 +0000 (12:07 +0200)]
lavfi/lut: add direct path.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 17 Apr 2013 15:30:07 +0000 (17:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: check motion vectors.

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/stereo3d: check input width & height
Paul B Mahol [Wed, 17 Apr 2013 15:15:12 +0000 (15:15 +0000)]
lavfi/stereo3d: check input width & height

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95'
Michael Niedermayer [Wed, 17 Apr 2013 14:55:27 +0000 (16:55 +0200)]
Merge commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95'

* commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95':
  indeo3: fix data size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'
Michael Niedermayer [Wed, 17 Apr 2013 14:50:34 +0000 (16:50 +0200)]
Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'

* commit '66531d634e75b834e89e4a6a0f7470ca018712a1':
  indeo3: switch parsing the header to bytestream2

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf'
Michael Niedermayer [Wed, 17 Apr 2013 14:19:14 +0000 (16:19 +0200)]
Merge commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf'

* commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf':
  rv10: check that extradata is large enough

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'
Michael Niedermayer [Wed, 17 Apr 2013 14:10:23 +0000 (16:10 +0200)]
Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'

* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
  rv10: return meaningful error codes.

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'
Michael Niedermayer [Wed, 17 Apr 2013 14:04:38 +0000 (16:04 +0200)]
Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'

* commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0':
  rv10: cosmetics, reformat
  qdm2: check that the FFT size is a power of 2

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'
Michael Niedermayer [Wed, 17 Apr 2013 13:52:10 +0000 (15:52 +0200)]
Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'

* commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3':
  svq1dec: clip motion vectors to the frame size.

Conflicts:
libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'
Michael Niedermayer [Wed, 17 Apr 2013 13:35:41 +0000 (15:35 +0200)]
Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'

* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
  svq1dec: check that the reference frame has the same dimensions as the current one

Conflicts:
libavcodec/svq1dec.c

See: 3b57bb478ff4455773378355e285877d757e151e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'
Michael Niedermayer [Wed, 17 Apr 2013 13:13:07 +0000 (15:13 +0200)]
Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'

* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
  af_channelmap: cosmetics, use an extra local variable to shorten the code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'aafed1175df76603e94c99a7748968780d6548d2'
Michael Niedermayer [Wed, 17 Apr 2013 13:04:16 +0000 (15:04 +0200)]
Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'

* commit 'aafed1175df76603e94c99a7748968780d6548d2':
  af_channelmap: sanity check input channel indices in all cases.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/stereo3d: fix output width for sbsl/sbs2l
Paul B Mahol [Wed, 17 Apr 2013 12:17:50 +0000 (12:17 +0000)]
lavfi/stereo3d: fix output width for sbsl/sbs2l

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: remove bad inverse telecine filters
Paul B Mahol [Tue, 16 Apr 2013 14:55:30 +0000 (14:55 +0000)]
lavfi: remove bad inverse telecine filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoindeo3: check motion vectors.
Anton Khirnov [Tue, 16 Apr 2013 07:41:28 +0000 (09:41 +0200)]
indeo3: check motion vectors.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agoindeo3: fix data size check
Anton Khirnov [Wed, 10 Apr 2013 07:59:36 +0000 (09:59 +0200)]
indeo3: fix data size check

The data offsets are relative to the bistream header, which is 16 bytes
after the start of the data.
Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agoindeo3: switch parsing the header to bytestream2
Anton Khirnov [Wed, 10 Apr 2013 07:40:20 +0000 (09:40 +0200)]
indeo3: switch parsing the header to bytestream2

Also add an additional sanity check to the alt_quant table.
Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agocmdutils: slightly better -filters output.
Clément Bœsch [Wed, 17 Apr 2013 09:31:49 +0000 (11:31 +0200)]
cmdutils: slightly better -filters output.

7 years agolavfi/buffersrc: fix failed requests count.
Nicolas George [Sun, 14 Apr 2013 11:51:42 +0000 (13:51 +0200)]
lavfi/buffersrc: fix failed requests count.

The line was lost during the AVFrame transition.
It causes programs relying on the failed requests count,
especially ffmpeg, to add frames to the wrong input.

Fix trac ticket #2467.

7 years agoexamples/filtering_audio: get rid of AVABufferSinkParams
Pavel Koshevoy [Wed, 17 Apr 2013 06:46:49 +0000 (00:46 -0600)]
examples/filtering_audio: get rid of AVABufferSinkParams

AVABufferSinkParams are ignored by avfilter_graph_create_filter,
therefore the example is misleading.  Use av_opt_set_int_list to
configure abuffersink directly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/filtering_audio: enable ref counted frames
Michael Niedermayer [Wed, 17 Apr 2013 08:46:16 +0000 (10:46 +0200)]
examples/filtering_audio: enable ref counted frames

Fixes accessing freed memory

Signe-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: use format title metadata to set window caption.
Clément Bœsch [Tue, 16 Apr 2013 18:07:03 +0000 (20:07 +0200)]
ffplay: use format title metadata to set window caption.

7 years agorv10: check that extradata is large enough
Anton Khirnov [Tue, 9 Apr 2013 18:33:25 +0000 (20:33 +0200)]
rv10: check that extradata is large enough

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agorv10: return meaningful error codes.
Anton Khirnov [Tue, 9 Apr 2013 18:11:09 +0000 (20:11 +0200)]
rv10: return meaningful error codes.

Also improve some error messages.

7 years agorv10: cosmetics, reformat
Anton Khirnov [Tue, 9 Apr 2013 18:06:44 +0000 (20:06 +0200)]
rv10: cosmetics, reformat

7 years agoqdm2: check that the FFT size is a power of 2
Anton Khirnov [Tue, 9 Apr 2013 13:25:20 +0000 (15:25 +0200)]
qdm2: check that the FFT size is a power of 2

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agosvq1dec: clip motion vectors to the frame size.
Anton Khirnov [Mon, 8 Apr 2013 20:15:54 +0000 (22:15 +0200)]
svq1dec: clip motion vectors to the frame size.

Fixes invalid reads for corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agosvq1dec: check that the reference frame has the same dimensions as the current one
Anton Khirnov [Mon, 8 Apr 2013 20:12:12 +0000 (22:12 +0200)]
svq1dec: check that the reference frame has the same dimensions as the current one

They can be different if the last keyframe failed to decode correctly.
Fixes possible invalid reads in such a case.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

7 years agoaf_channelmap: cosmetics, use an extra local variable to shorten the code
Anton Khirnov [Sun, 14 Apr 2013 10:10:50 +0000 (12:10 +0200)]
af_channelmap: cosmetics, use an extra local variable to shorten the code

7 years agoaf_channelmap: sanity check input channel indices in all cases.
Anton Khirnov [Sun, 14 Apr 2013 10:07:24 +0000 (12:07 +0200)]
af_channelmap: sanity check input channel indices in all cases.

Fixes invalid reads from non-existing channels.

CC:libav-stable@libav.org

7 years agolavfi/histeq: fix out of array write
Paul B Mahol [Wed, 17 Apr 2013 00:21:17 +0000 (00:21 +0000)]
lavfi/histeq: fix out of array write

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agormdec: dont return uninitialized data
Michael Niedermayer [Tue, 16 Apr 2013 23:31:53 +0000 (01:31 +0200)]
rmdec: dont return uninitialized data

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove two anonymous arrays.
Carl Eugen Hoyos [Tue, 16 Apr 2013 22:37:05 +0000 (00:37 +0200)]
Remove two anonymous arrays.

Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.

7 years agoass_split: Do not use the function name as a parameter name in a declaration.
Carl Eugen Hoyos [Tue, 16 Apr 2013 22:35:00 +0000 (00:35 +0200)]
ass_split: Do not use the function name as a parameter name in a declaration.

Fixes compilation of srtenc.o with PGC 13.4-0.

7 years agobutterflies_float: replace 2 lea by 2 add
Michael Niedermayer [Tue, 16 Apr 2013 21:52:24 +0000 (23:52 +0200)]
butterflies_float: replace 2 lea by 2 add

adds are simpler instructions and should be faster or equally fast
on all cpus

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: float dsp: butterflies_float SSE
Christophe Gisquet [Fri, 12 Apr 2013 19:07:01 +0000 (21:07 +0200)]
x86: float dsp: butterflies_float SSE

97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/il: remove pointless store
Paul B Mahol [Tue, 16 Apr 2013 21:45:34 +0000 (21:45 +0000)]
lavfi/il: remove pointless store

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/earwax: remove pointless store
Paul B Mahol [Tue, 16 Apr 2013 21:27:49 +0000 (21:27 +0000)]
lavfi/earwax: remove pointless store

Signed-off-by: Paul B Mahol <onemda@gmail.com>