ffmpeg.git
6 years agoMerge commit 'b564784a207b1395d2b5a41e580539df04651096'
Michael Niedermayer [Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)]
Merge commit 'b564784a207b1395d2b5a41e580539df04651096'

* commit 'b564784a207b1395d2b5a41e580539df04651096':
  jpeg2000: Check that there is a SOT before SOD
  jpeg2000: Remove unneeded returns

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
Michael Niedermayer [Wed, 3 Jul 2013 12:49:28 +0000 (14:49 +0200)]
Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'

* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
  jpeg2000: Propagate error code from get_cox()
  jpeg2000: Check that nreslevels2decode has been initialized before use

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
Michael Niedermayer [Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)]
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'

* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
  jpeg2000: Drop unused and writeonly fields
  jpeg2000: Correctly calculate sgnd

Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
Michael Niedermayer [Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)]
Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'

* commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
  jpeg2000: check len before parsing header
  jpeg2000: Check component number in get_coc() and get_qcc()

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
Michael Niedermayer [Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)]
Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
  jpeg2000: Check zero bit-plane validity

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'
Michael Niedermayer [Wed, 3 Jul 2013 12:20:36 +0000 (14:20 +0200)]
Merge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'

* commit '7e201d575dc4385eb67314b0419d4d77185e65f4':
  jpeg2000: Validate block lengthinc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '278a923c51187d37445d88a6b21082036ec9568d'
Michael Niedermayer [Wed, 3 Jul 2013 11:57:59 +0000 (13:57 +0200)]
Merge commit '278a923c51187d37445d88a6b21082036ec9568d'

* commit '278a923c51187d37445d88a6b21082036ec9568d':
  jpeg2000: Validate SIZ parsing

Conflicts:
libavcodec/jpeg2000dec.c

This commit is not exactly merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd3cb302b88503c3111e25add196622110c056188'
Michael Niedermayer [Wed, 3 Jul 2013 11:20:57 +0000 (13:20 +0200)]
Merge commit 'd3cb302b88503c3111e25add196622110c056188'

* commit 'd3cb302b88503c3111e25add196622110c056188':
  jpeg2000: Validate SOT parsing

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next...
Stefano Sabatini [Mon, 1 Jul 2013 23:39:14 +0000 (01:39 +0200)]
lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump

Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.

If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().

At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.

Should address trac ticket #2672.

6 years agoconfigure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi
Stefano Sabatini [Mon, 1 Jul 2013 16:47:09 +0000 (18:47 +0200)]
configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi

"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.

Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.

6 years agoMerge commit '57bc64e'
Michael Niedermayer [Wed, 3 Jul 2013 11:00:57 +0000 (13:00 +0200)]
Merge commit '57bc64e'

* commit '57bc64e':
  jpeg2000: Use bytestream2
  jpeg2000: Clean up return paths and error messages
  jpeg2000: Define the maximum decomposition levels
  jpeg2000: Check code-block size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "doc: add script to compute texi files dependencies"
Michael Niedermayer [Wed, 3 Jul 2013 10:59:59 +0000 (12:59 +0200)]
Revert "doc: add script to compute texi files dependencies"

This reverts commit 628ceac6526724d35cb390cc1f88344f4ea22eb4.

The commit broke out of tree builds

6 years agoMerge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'
Michael Niedermayer [Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)]
Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
  jpeg2000: Use bytestream2

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
Michael Niedermayer [Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)]
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'

* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
  jpeg2000: Clean up return paths and error messages

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be3271009ef893fbed9640e8edbd771685fd957b'
Michael Niedermayer [Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)]
Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

* commit 'be3271009ef893fbed9640e8edbd771685fd957b':
  jpeg2000: Define the maximum decomposition levels

Conflicts:
libavcodec/jpeg2000.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
Michael Niedermayer [Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'

* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
  jpeg2000: Check code-block size

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing: make more compact audio/video_time computation
Stefano Sabatini [Tue, 25 Jun 2013 22:06:53 +0000 (00:06 +0200)]
examples/muxing: make more compact audio/video_time computation

6 years agodoc/muxers: Add AIFF doc
Timothy Gu [Wed, 3 Jul 2013 02:32:27 +0000 (19:32 -0700)]
doc/muxers: Add AIFF doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc: add script to compute texi files dependencies
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies

Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

6 years agoMerge commit '5650e331a733711b809bc27f968500f0f5530126'
Michael Niedermayer [Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)]
Merge commit '5650e331a733711b809bc27f968500f0f5530126'

* commit '5650e331a733711b809bc27f968500f0f5530126':
  jpeg2000: Validate resolution levels

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/avcodec.h: fix prolems -> problems typo
Stefano Sabatini [Tue, 2 Jul 2013 09:21:44 +0000 (11:21 +0200)]
lavc/avcodec.h: fix prolems -> problems typo

6 years agoMAINTAINERS: add address to contact "AvxSynth Team"
Michael Niedermayer [Wed, 3 Jul 2013 00:26:13 +0000 (02:26 +0200)]
MAINTAINERS: add address to contact "AvxSynth Team"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: Allow VP9 and Opus in webm
Tudor Suciu [Sun, 2 Jun 2013 15:49:24 +0000 (17:49 +0200)]
avformat/matroskaenc: Allow VP9 and Opus in webm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: Check that there is a SOT before SOD
Michael Niedermayer [Mon, 1 Jul 2013 08:01:14 +0000 (10:01 +0200)]
jpeg2000: Check that there is a SOT before SOD

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Propagate error code from get_cox()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:12 +0000 (10:01 +0200)]
jpeg2000: Propagate error code from get_cox()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Remove unneeded returns
Michael Niedermayer [Mon, 1 Jul 2013 08:01:13 +0000 (10:01 +0200)]
jpeg2000: Remove unneeded returns

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check that nreslevels2decode has been initialized before use
Michael Niedermayer [Mon, 1 Jul 2013 08:01:11 +0000 (10:01 +0200)]
jpeg2000: Check that nreslevels2decode has been initialized before use

Avoid buffer overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Drop unused and writeonly fields
Michael Niedermayer [Mon, 1 Jul 2013 08:01:10 +0000 (10:01 +0200)]
jpeg2000: Drop unused and writeonly fields

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: check len before parsing header
Michael Niedermayer [Mon, 1 Jul 2013 08:01:08 +0000 (10:01 +0200)]
jpeg2000: check len before parsing header

Avoid overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check zero bit-plane validity
Michael Niedermayer [Mon, 1 Jul 2013 08:01:06 +0000 (10:01 +0200)]
jpeg2000: Check zero bit-plane validity

Prevent integer overflows.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate block lengthinc
Luca Barbato [Mon, 1 Jul 2013 08:01:05 +0000 (10:01 +0200)]
jpeg2000: Validate block lengthinc

Currently we are using an array with a static data size.

Similar to a patch with the same purpose by Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate SIZ parsing
Michael Niedermayer [Mon, 1 Jul 2013 08:01:04 +0000 (10:01 +0200)]
jpeg2000: Validate SIZ parsing

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate SOT parsing
Michael Niedermayer [Mon, 1 Jul 2013 08:01:03 +0000 (10:01 +0200)]
jpeg2000: Validate SOT parsing

Avoid some overreads.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Correctly calculate sgnd
Michael Niedermayer [Mon, 1 Jul 2013 08:01:09 +0000 (10:01 +0200)]
jpeg2000: Correctly calculate sgnd

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check component number in get_coc() and get_qcc()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:07 +0000 (10:01 +0200)]
jpeg2000: Check component number in get_coc() and get_qcc()

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Use bytestream2
Michael Niedermayer [Mon, 1 Jul 2013 08:01:02 +0000 (10:01 +0200)]
jpeg2000: Use bytestream2

Prevent a number of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Clean up return paths and error messages
Luca Barbato [Mon, 1 Jul 2013 08:01:01 +0000 (10:01 +0200)]
jpeg2000: Clean up return paths and error messages

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Define the maximum decomposition levels
Luca Barbato [Mon, 1 Jul 2013 08:01:00 +0000 (10:01 +0200)]
jpeg2000: Define the maximum decomposition levels

And define the resolution levels according.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check code-block size
Michael Niedermayer [Mon, 1 Jul 2013 08:00:59 +0000 (10:00 +0200)]
jpeg2000: Check code-block size

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate resolution levels
Luca Barbato [Mon, 1 Jul 2013 08:00:58 +0000 (10:00 +0200)]
jpeg2000: Validate resolution levels

There are 32 maximum decomposition levels, thus 33 resolution levels.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavf: add support for libgme
wm4 [Fri, 28 Jun 2013 08:36:00 +0000 (10:36 +0200)]
lavf: add support for libgme

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a maintainer for the delogo filter
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
Add a maintainer for the delogo filter

I volunteer to maintain the delogo filter for at least the year to
come.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: clarify the expected format in the document header
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
MAINTAINERS: clarify the expected format in the document header

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: move ret init down from flush codecs.
Michael Niedermayer [Tue, 2 Jul 2013 13:06:43 +0000 (15:06 +0200)]
avformat_find_stream_info: move ret init down from flush codecs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: Do not consider no streams an error in flush codecs
Michael Niedermayer [Tue, 2 Jul 2013 13:04:13 +0000 (15:04 +0200)]
avformat_find_stream_info: Do not consider no streams an error in flush codecs

This should have no functional effect, but allows a cleaner diff when moving it
down

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: try to preserve the error code
Michael Niedermayer [Tue, 2 Jul 2013 13:02:55 +0000 (15:02 +0200)]
avformat_find_stream_info: try to preserve the error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_find_stream_info: initialize ret
Michael Niedermayer [Tue, 2 Jul 2013 13:00:28 +0000 (15:00 +0200)]
av_find_stream_info: initialize ret

This should fix hypothetical corner cases where it might have never been initialized before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Print "Consider increasing the value for analzeduration and probesize"...
Carl Eugen Hoyos [Thu, 20 Jun 2013 07:34:15 +0000 (09:34 +0200)]
avformat: Print "Consider increasing the value for analzeduration and probesize" even more often

The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/x86: reenable ff_update_lls_avx()
Michael Niedermayer [Tue, 2 Jul 2013 09:58:08 +0000 (11:58 +0200)]
avutil/x86: reenable ff_update_lls_avx()

The bug has been fixed in c8b920a9b7fa534a6141695ace4e8c2dfcd56cee by Loren Merritt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 2 Jul 2013 09:50:30 +0000 (11:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggdec: do not fall back on binary search in the generic code.

Conflicts:
libavformat/oggdec.c
tests/ref/seek/lavf-ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'
Michael Niedermayer [Tue, 2 Jul 2013 09:40:38 +0000 (11:40 +0200)]
Merge commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'

* commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee':
  lls/x86: use 3-operator vaddpd in ADDPD_MEM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8bd9039900e67a633cc838d691c449e71c060553'
Michael Niedermayer [Tue, 2 Jul 2013 09:26:49 +0000 (11:26 +0200)]
Merge commit '8bd9039900e67a633cc838d691c449e71c060553'

* commit '8bd9039900e67a633cc838d691c449e71c060553':
  Revert "indeo5: reject negative motion vectors"

See: cc53c28fdc2bd060e90a82d4238ad26e619a9fca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: do not fall back on binary search in the generic code.
Anton Khirnov [Fri, 28 Jun 2013 16:38:37 +0000 (18:38 +0200)]
oggdec: do not fall back on binary search in the generic code.

Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.

6 years agolls/x86: use 3-operator vaddpd in ADDPD_MEM
Loren Merritt [Tue, 2 Jul 2013 05:56:56 +0000 (07:56 +0200)]
lls/x86: use 3-operator vaddpd in ADDPD_MEM

Fixes build with yasm-1.1

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoh264: fix indention of xchg_mb_border()
Michael Niedermayer [Tue, 2 Jul 2013 00:11:49 +0000 (02:11 +0200)]
h264: fix indention of xchg_mb_border()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: move 444 border xchg under if (deblock_top)
Michael Niedermayer [Mon, 1 Jul 2013 23:41:19 +0000 (01:41 +0200)]
h264: move 444 border xchg under if (deblock_top)

Fixes out of array access
Fixes Ticket2668

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/http: add support for reading streamcast metadata
wm4 [Tue, 25 Jun 2013 22:53:26 +0000 (00:53 +0200)]
lavf/http: add support for reading streamcast metadata

Allow applications to request reading streamcast metadata. This uses
AVOptions as API, and requires the application to explicitly request
and read metadata. Metadata can be updated mid-stream; if an
application is interested in that, it has to poll for the data by
reading the "icy_metadata_packet" option in regular intervals.

There doesn't seem to be a nice way to transfer the metadata in a nicer
way. Converting the metadata to ID3v2 tags might be a nice idea, but
the libavformat mp3 demuxer doesn't seem to read these tags mid-stream,
and even then we couldn't guarantee that tags are not inserted in the
middle of mp3 packet data.

This commit provides the minimum to enable applications to retrieve
this information at all.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agormdec: Pass AVIOContext to rm_read_metadata()
Michael Niedermayer [Mon, 1 Jul 2013 21:38:08 +0000 (23:38 +0200)]
rmdec: Pass AVIOContext to rm_read_metadata()

Fix null pointer dereference
Fixes Ticket2588

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowestwood_vqa: check return value of av_malloc()
Paul B Mahol [Mon, 1 Jul 2013 22:15:25 +0000 (22:15 +0000)]
westwood_vqa: check return value of av_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoidcin: check return value of av_malloc()
Paul B Mahol [Mon, 1 Jul 2013 22:04:48 +0000 (22:04 +0000)]
idcin: check return value of av_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agobfi: check return value of av_malloc()
Paul B Mahol [Mon, 1 Jul 2013 21:37:16 +0000 (21:37 +0000)]
bfi: check return value of av_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/x86/dsputil_init: only use xvid idct for lowres=0
Michael Niedermayer [Mon, 1 Jul 2013 18:48:38 +0000 (20:48 +0200)]
avcodec/x86/dsputil_init: only use xvid idct for lowres=0

Fixes crash
Fixes Ticket2714

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: apply various fixes to libmp3lame documentation
Stefano Sabatini [Mon, 1 Jul 2013 13:59:51 +0000 (15:59 +0200)]
doc/encoders: apply various fixes to libmp3lame documentation

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Jul 2013 10:03:17 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: check for reference when inheriting mvs

See: 4b35ee0b7c0c4cbac3541a25a5e8c00b657c8f95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1194a410807bac3eafbeb632578b937656d273e7'
Michael Niedermayer [Mon, 1 Jul 2013 09:45:28 +0000 (11:45 +0200)]
Merge commit '1194a410807bac3eafbeb632578b937656d273e7'

* commit '1194a410807bac3eafbeb632578b937656d273e7':
  indeo5: reject negative motion vectors

The added check is wrong and thus not merged.
A correct check already exists in avcodec.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dd3754a48854cd570d38db72394491aab0f36570'
Michael Niedermayer [Mon, 1 Jul 2013 09:37:13 +0000 (11:37 +0200)]
Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'

* commit 'dd3754a48854cd570d38db72394491aab0f36570':
  indeo: use proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7388c0c58601477db076e2e74e8b11f8a644384a'
Michael Niedermayer [Mon, 1 Jul 2013 09:31:16 +0000 (11:31 +0200)]
Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'

* commit '7388c0c58601477db076e2e74e8b11f8a644384a':
  indeo: Properly forward the error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/delogo: use weighted interpolation
Jean Delvare [Wed, 26 Jun 2013 12:50:37 +0000 (14:50 +0200)]
lavfi/delogo: use weighted interpolation

The original delogo algorithm interpolates both horizontally and
vertically and uses the average to compute the resulting sample. This
works reasonably well when the logo area is almost square. However
when the logo area is significantly larger than high or higher than
large, the result is largely suboptimal.

The issue can be clearly seen by testing the delogo filter with a fake
logo area that is 200 pixels large and 2 pixels high. Vertical
interpolation gives a very good result in that case, horizontal
interpolation gives a very bad result, and the overall result is poor,
because both are given the same weight.

Even when the logo is roughly square, the current algorithm gives poor
results on the borders of the logo area, because it always gives
horizontal and vertical interpolations an equal weight, and this is
suboptimal on borders. For example, in the middle of the left hand
side border of the logo, you want to trust the left known point much
more than the right known point (which the current algorithm already
does) but also much more than the top and bottom known points (which
the current algorithm doesn't do.)

By properly weighting each known point when computing the value of
each interpolated pixel, the visual result is much better, especially
on borders and/or for high or large logo areas.

The algorithm I implemented guarantees that the weight of each of the
4 known points directly depends on its distance to the interpolated
point. It is largely inspired from the original algorithm, the key
difference being that it computes the relative weights globally
instead of separating the vertical and horizontal interpolations and
combining them afterward.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoRevert "indeo5: reject negative motion vectors"
Luca Barbato [Mon, 1 Jul 2013 04:49:46 +0000 (06:49 +0200)]
Revert "indeo5: reject negative motion vectors"

Negative motion vectors are possible.

This reverts commit 1194a410807bac3eafbeb632578b937656d273e7.

6 years agoindeo: check for reference when inheriting mvs
Luca Barbato [Sun, 30 Jun 2013 08:40:37 +0000 (10:40 +0200)]
indeo: check for reference when inheriting mvs

The same is done already for qdelta.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoindeo5: reject negative motion vectors
Luca Barbato [Sun, 30 Jun 2013 08:35:07 +0000 (10:35 +0200)]
indeo5: reject negative motion vectors

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoindeo: use proper error code
Luca Barbato [Sun, 30 Jun 2013 08:11:05 +0000 (10:11 +0200)]
indeo: use proper error code

6 years agoindeo: Properly forward the error codes
Luca Barbato [Sun, 30 Jun 2013 07:57:56 +0000 (09:57 +0200)]
indeo: Properly forward the error codes

If the tile data size does not match the buffer size it did not
return an AVERROR_INVALIDDATA causing futher corruption later.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoAvoid a null pointer dereference in avcodec_decode_audio4().
Carl Eugen Hoyos [Mon, 1 Jul 2013 01:07:44 +0000 (03:07 +0200)]
Avoid a null pointer dereference in avcodec_decode_audio4().

This could happen if oom occured while probing a file.
Fixes ticket #2722.

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 1 Jul 2013 00:41:22 +0000 (02:41 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: always send zero packets to flush audio decoders
  ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"
Michael Niedermayer [Mon, 1 Jul 2013 00:27:47 +0000 (02:27 +0200)]
Revert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"

This reverts commit 247425241cb3b2b76df1c2aced5ce0d56126b82d.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Jul 2013 00:26:15 +0000 (02:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: lpc: fix a segfault in av_evaluate_lls_sse2()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: Check VLC tables during use instead of setup
Michael Niedermayer [Mon, 1 Jul 2013 00:09:29 +0000 (02:09 +0200)]
vorbisdec: Check VLC tables during use instead of setup

Fixes regression and Ticket2720

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: propagate errors from setup_classifs()
Michael Niedermayer [Mon, 1 Jul 2013 00:07:26 +0000 (02:07 +0200)]
vorbisdec: propagate errors from setup_classifs()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: lpc: fix a segfault in av_evaluate_lls_sse2()
Loren Merritt [Sun, 30 Jun 2013 22:56:58 +0000 (22:56 +0000)]
x86: lpc: fix a segfault in av_evaluate_lls_sse2()

6 years agoffplay: always send zero packets to flush audio decoders
Marton Balint [Sat, 29 Jun 2013 12:44:30 +0000 (14:44 +0200)]
ffplay: always send zero packets to flush audio decoders

Zero packets are needed not for codecs with CODEC_CAP_DELAY but for
multithreaded decoders as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Marton Balint [Sat, 29 Jun 2013 10:44:47 +0000 (12:44 +0200)]
ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation

Fixes ticket #2717.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoAvoid a null pointer dereference after oom on frame size change in mpegvideo.c.
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:45:37 +0000 (23:45 +0200)]
Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.

Fixes ticket #2735.

6 years agoAvoid a null pointer dereference on oom in the aac encoder.
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:25:18 +0000 (23:25 +0200)]
Avoid a null pointer dereference on oom in the aac encoder.

Fixes ticket #2732.

6 years agoindeo3: check return values of av_malloc()
Paul B Mahol [Sun, 30 Jun 2013 16:58:13 +0000 (16:58 +0000)]
indeo3: check return values of av_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 30 Jun 2013 19:18:12 +0000 (21:18 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support compilation on aix with gcc.
  Rename "AVClass class" as "AVClass component_class".
  Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
  Rename thread_init() in libavcodec and libavfilter as library_thread_init().
  Rename constant HZ in af_biquads.c as HERTZ.
  Drop local lable from ppc asm timer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/x86: disable ff_evaluate_lls_sse2() for 32bit
Michael Niedermayer [Sun, 30 Jun 2013 16:58:06 +0000 (18:58 +0200)]
avutil/x86: disable ff_evaluate_lls_sse2() for 32bit

It just segfaults on 32bit, thus its disabled until someone fixes it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflac_parser: check return value of av_fifo_alloc()
Paul B Mahol [Sun, 30 Jun 2013 16:49:45 +0000 (16:49 +0000)]
flac_parser: check return value of av_fifo_alloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/movenc: use ffio_fill()
Matthieu Bouron [Sun, 30 Jun 2013 14:15:44 +0000 (16:15 +0200)]
lavf/movenc: use ffio_fill()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: use seek_back() for all seek backs
Michael Niedermayer [Sun, 30 Jun 2013 13:46:04 +0000 (15:46 +0200)]
mpegts: use seek_back() for all seek backs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: factor seek_back() out
Michael Niedermayer [Sun, 30 Jun 2013 13:45:23 +0000 (15:45 +0200)]
mpegts: factor seek_back() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts_read_header: goto fail instead of return directly
Michael Niedermayer [Sun, 30 Jun 2013 13:42:12 +0000 (15:42 +0200)]
mpegts_read_header: goto fail instead of return directly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Jun 2013 12:04:22 +0000 (14:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
libavcodec/mjpegdec.c

See: a9456c7c5ca883b5a3947e59a9fba5587e18e119

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7520d9779c6d30b385df5a0a42da508238076192'
Michael Niedermayer [Sun, 30 Jun 2013 11:50:55 +0000 (13:50 +0200)]
Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport compilation on aix with gcc.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:47:10 +0000 (13:47 +0200)]
Support compilation on aix with gcc.

Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.

6 years agoRename "AVClass class" as "AVClass component_class".
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:46:27 +0000 (13:46 +0200)]
Rename "AVClass class" as "AVClass component_class".

The aix header math.h defines "extern int class()" for C.

6 years agoRename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:45:10 +0000 (13:45 +0200)]
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.

The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.

6 years agoRename thread_init() in libavcodec and libavfilter as library_thread_init().
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:34:46 +0000 (13:34 +0200)]
Rename thread_init() in libavcodec and libavfilter as library_thread_init().

The aix header sys/thread.h contains a definition for thread_init().

6 years agoRename constant HZ in af_biquads.c as HERTZ.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:32:59 +0000 (13:32 +0200)]
Rename constant HZ in af_biquads.c as HERTZ.

The aix header sys/m_param.h defines HZ as _HZ.

6 years agoDrop local lable from ppc asm timer.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:31:25 +0000 (13:31 +0200)]
Drop local lable from ppc asm timer.

The aix assembler does not support local lables.