ffmpeg.git
6 years agortmp: fix buffer overflows in ff_amf_tag_contents()
Xi Wang [Wed, 23 Jan 2013 02:40:05 +0000 (21:40 -0500)]
rtmp: fix buffer overflows in ff_amf_tag_contents()

A negative `size' will bypass FFMIN().  In the subsequent memcpy() call,
`size' will be considered as a large positive value, leading to a buffer
overflow.

Change the type of `size' to unsigned int to avoid buffer overflow, and
simplify overflow checks accordingly.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: fix multiple broken overflow checks
Xi Wang [Tue, 22 Jan 2013 22:49:29 +0000 (17:49 -0500)]
rtmp: fix multiple broken overflow checks

Sanity checks like `data + size >= data_end || data + size < data' are
broken, because `data + size < data' assumes pointer overflow, which is
undefined behavior in C.  Many compilers such as gcc/clang optimize such
checks away.

Use `size < 0 || size >= data_end - data' instead.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: fix overflow checking in avc_mp4_find_startcode()
Xi Wang [Wed, 23 Jan 2013 01:58:07 +0000 (20:58 -0500)]
rtpenc: fix overflow checking in avc_mp4_find_startcode()

The check `start + res < start' is broken since pointer overflow is
undefined behavior in C.  Many compilers such as gcc/clang optimize
away this check.

Use `res > end - start' instead.  Also change `res' to unsigned int
to avoid signed left-shift overflow.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: use av_mallocz()
Michael Niedermayer [Wed, 23 Jan 2013 04:09:43 +0000 (05:09 +0100)]
truemotion2: use av_mallocz()

Fixes use of uninitialized values.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: clear the token array if its initialization fails.
Michael Niedermayer [Wed, 23 Jan 2013 03:41:41 +0000 (04:41 +0100)]
truemotion2: clear the token array if its initialization fails.

Fixes use of uninitialized and half initialized values, which
can occur on several error pathes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: check channel count.
Michael Niedermayer [Tue, 22 Jan 2013 22:05:53 +0000 (23:05 +0100)]
mvdec: check channel count.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: minor simplification, remove av_inv_q()
Michael Niedermayer [Tue, 22 Jan 2013 21:52:23 +0000 (22:52 +0100)]
mvdec: minor simplification, remove av_inv_q()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: use avpriv_set_pts_info() instead of directly setting tb.
Michael Niedermayer [Tue, 22 Jan 2013 21:40:38 +0000 (22:40 +0100)]
mvdec: use avpriv_set_pts_info() instead of directly setting tb.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: remove "duplicate" for loop.
Michael Niedermayer [Tue, 22 Jan 2013 21:28:41 +0000 (22:28 +0100)]
sanm: remove "duplicate" for loop.

Fixes input buffer overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: check image dimensions before using them
Michael Niedermayer [Tue, 22 Jan 2013 20:30:20 +0000 (21:30 +0100)]
sanm: check image dimensions before using them

Avoids integer overflows and out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolagarith: return more meaningful error codes
Paul B Mahol [Tue, 22 Jan 2013 19:48:23 +0000 (19:48 +0000)]
lagarith: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/showwaves: fix check on showwaves->outpicref
Stefano Sabatini [Tue, 22 Jan 2013 11:18:52 +0000 (12:18 +0100)]
lavfi/showwaves: fix check on showwaves->outpicref

outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.

Fix regression introduced in 5f634480d1c4ed7711a15d1be07e49177cf351c1,
+10l to me.

6 years agoFix compilation with --disable-everything --enable-demuxer=loas
Carl Eugen Hoyos [Tue, 22 Jan 2013 19:26:10 +0000 (20:26 +0100)]
Fix compilation with --disable-everything --enable-demuxer=loas

6 years agolavf/aiffenc: ID3 tags support
Matthieu Bouron [Fri, 4 Jan 2013 20:19:40 +0000 (21:19 +0100)]
lavf/aiffenc: ID3 tags support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs
Stefano Sabatini [Tue, 22 Jan 2013 19:17:00 +0000 (20:17 +0100)]
lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs

6 years agodoc/muxers: remove outdated comment about live flags for the segment muxer
Stefano Sabatini [Tue, 22 Jan 2013 19:12:59 +0000 (20:12 +0100)]
doc/muxers: remove outdated comment about live flags for the segment muxer

The live flags is currently unused, but still kept for backward
compatibility reasons (and in case it turns to be useful again for
whatever reason).

6 years agoSupport solid gray frames when decoding Lagarith.
Carl Eugen Hoyos [Tue, 22 Jan 2013 19:17:53 +0000 (20:17 +0100)]
Support solid gray frames when decoding Lagarith.

Fixes bug 431.

6 years agolibm: Add fallback definition for cbrt() using pow()
James Almer [Tue, 22 Jan 2013 07:10:21 +0000 (04:10 -0300)]
libm: Add fallback definition for cbrt() using pow()

The function is known to be missing in at least one target (MSVC).

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 22 Jan 2013 13:54:06 +0000 (14:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: support mixed interlaced/non-interlaced content
  vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: do not use random values for seq when bitexact is requested.
Michael Niedermayer [Tue, 22 Jan 2013 13:40:18 +0000 (14:40 +0100)]
rtpenc: do not use random values for seq when bitexact is requested.

Fixes fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'
Michael Niedermayer [Tue, 22 Jan 2013 13:27:48 +0000 (14:27 +0100)]
Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'

* commit '4f56e773fe8a554b8c2662650aaf799c2ece2721':
  x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
  rtpenc: Start the sequence numbers from a random offset

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'
Michael Niedermayer [Tue, 22 Jan 2013 12:59:13 +0000 (13:59 +0100)]
Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
  Revert "fate: Use wmv2 IDCT for wmv2 tests"

Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
Michael Niedermayer [Tue, 22 Jan 2013 12:49:45 +0000 (13:49 +0100)]
Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
  get_bits/put_bits: K&R formatting cosmetics

Conflicts:
libavcodec/get_bits.h
libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'
Michael Niedermayer [Tue, 22 Jan 2013 12:38:20 +0000 (13:38 +0100)]
Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

* commit '570a4a0189946c2c983da41d37fdd67fa13266e7':
  avidec: use sensible error codes instead of -1

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoproresdec: support mixed interlaced/non-interlaced content
Michael Smith [Mon, 21 Jan 2013 18:40:35 +0000 (19:40 +0100)]
proresdec: support mixed interlaced/non-interlaced content

Set interlaced to false if we don't have an interlaced frame

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomov: prevent double free if the caller replaces the io context.
Michael Niedermayer [Tue, 22 Jan 2013 04:15:47 +0000 (05:15 +0100)]
mov: prevent double free if the caller replaces the io context.

Fixes Ticket2148

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/cabac: workaround llvm 4.2.1 bug
Michael Niedermayer [Tue, 22 Jan 2013 02:13:51 +0000 (03:13 +0100)]
avcodec/x86/cabac: workaround llvm 4.2.1 bug

x86_64 is affected by this too
Fixes Ticket2156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Ronald S. Bultje [Mon, 21 Jan 2013 19:02:33 +0000 (11:02 -0800)]
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.

The function is only used in VP3 and VP5, so no need to have it in
DSPContext.

6 years agodoc: document aresample:first_pts
Michael Niedermayer [Mon, 21 Jan 2013 15:47:34 +0000 (16:47 +0100)]
doc: document aresample:first_pts

Documentation copied from asyncts, the options are supposed to do
the same thing. If not please submit a testcase where they differ
so we can fix it.

Disscussed-with: saste on IRC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
Diego Biurrun [Mon, 21 Jan 2013 18:43:06 +0000 (19:43 +0100)]
x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

CC: libav-stable@libav.org
6 years agortpenc: Start the sequence numbers from a random offset
Martin Storsjö [Fri, 7 Dec 2012 09:12:28 +0000 (11:12 +0200)]
rtpenc: Start the sequence numbers from a random offset

Expose the current sequence number via an AVOption - this can
be used both for setting the initial sequence number, or for
querying the current number.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavf_showwaves: fix null pointer dereference
Michael Niedermayer [Mon, 21 Jan 2013 22:00:20 +0000 (23:00 +0100)]
avf_showwaves: fix null pointer dereference

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: More verbose description of the force resample flag.
Michael Niedermayer [Mon, 21 Jan 2013 21:45:58 +0000 (22:45 +0100)]
doc/swr: More verbose description of the force resample flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: elaborate on what the LFE mix level is.
Michael Niedermayer [Mon, 21 Jan 2013 20:48:34 +0000 (21:48 +0100)]
doc/swr: elaborate on what the LFE mix level is.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: typo fix
Michael Niedermayer [Mon, 21 Jan 2013 20:46:48 +0000 (21:46 +0100)]
doc/swr: typo fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: docu lfe mix level unit & range
Michael Niedermayer [Mon, 21 Jan 2013 20:44:39 +0000 (21:44 +0100)]
doc/swr: docu lfe mix level unit & range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: try to fix non english "inclusively included between"
Michael Niedermayer [Mon, 21 Jan 2013 20:41:07 +0000 (21:41 +0100)]
doc/swr: try to fix non english "inclusively included between"

Googling this term has 9 hits, 7 from ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: Mention that the internal sample format is choosen automatically if not set
Michael Niedermayer [Mon, 21 Jan 2013 20:16:43 +0000 (21:16 +0100)]
doc/swr: Mention that the internal sample format is choosen automatically if not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodocs/swr: better used_channel_count docs
Michael Niedermayer [Mon, 21 Jan 2013 20:14:27 +0000 (21:14 +0100)]
docs/swr: better used_channel_count docs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimg2dec: support seeking in infinitely looped stream
Michael Niedermayer [Tue, 8 Jan 2013 21:02:08 +0000 (22:02 +0100)]
img2dec: support seeking in infinitely looped stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "fate: Use wmv2 IDCT for wmv2 tests"
Luca Barbato [Mon, 21 Jan 2013 18:43:53 +0000 (19:43 +0100)]
Revert "fate: Use wmv2 IDCT for wmv2 tests"

This reverts commit ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3.

6 years agodoc/muxers: extend and clarify documentation for the segment muxer time options
Stefano Sabatini [Fri, 18 Jan 2013 23:50:40 +0000 (00:50 +0100)]
doc/muxers: extend and clarify documentation for the segment muxer time options

6 years agolavf/hlsenc: append last incomplete segment when closing the output
Stefano Sabatini [Sun, 13 Jan 2013 16:22:59 +0000 (17:22 +0100)]
lavf/hlsenc: append last incomplete segment when closing the output

Also introduce missing check on PTS value in case of NOPTS value.

6 years agodsputil: CONFIG_DWT doesnt exist anymore
Michael Niedermayer [Mon, 21 Jan 2013 18:09:16 +0000 (19:09 +0100)]
dsputil: CONFIG_DWT doesnt exist anymore

place snow dwt init under correct checks
should fix compilation with enable-random

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3: fix compilation with a disabled theora
Michael Niedermayer [Mon, 21 Jan 2013 18:04:34 +0000 (19:04 +0100)]
vp3: fix compilation with a disabled theora

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoget_bits/put_bits: K&R formatting cosmetics
Diego Biurrun [Sun, 20 Jan 2013 15:10:24 +0000 (16:10 +0100)]
get_bits/put_bits: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agooggdec: remove unused variables
Michael Niedermayer [Mon, 21 Jan 2013 15:41:50 +0000 (16:41 +0100)]
oggdec: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 21 Jan 2013 15:34:24 +0000 (16:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputilenc: x86: Convert pixel inline asm to yasm
  libgsm: detect libgsm header path

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
Michael Niedermayer [Mon, 21 Jan 2013 15:28:04 +0000 (16:28 +0100)]
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
  fate: Use wmv2 IDCT for wmv2 tests
  vorbisdsp: change block_size type from int to intptr_t.

Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoafade filter
Paul B Mahol [Thu, 17 Jan 2013 21:53:27 +0000 (21:53 +0000)]
afade filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '93af2734ee609133eaeca28329d7f13241dd411f'
Michael Niedermayer [Mon, 21 Jan 2013 15:14:41 +0000 (16:14 +0100)]
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'

* commit '93af2734ee609133eaeca28329d7f13241dd411f':
  lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
Michael Niedermayer [Mon, 21 Jan 2013 14:34:57 +0000 (15:34 +0100)]
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
  wmv2: move IDCT to its own DSP context.

Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: use sensible error codes instead of -1
Jindrich Makovicka [Thu, 17 Jan 2013 15:24:28 +0000 (16:24 +0100)]
avidec: use sensible error codes instead of -1

Use AVERROR_INVALIDDATA on invalid inputs, and AVERROR_EOF when no more
frames are available in an interleaved AVI.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoMerge commit '8a4f26206d7914eaf2903954ce97cb7686933382'
Michael Niedermayer [Mon, 21 Jan 2013 14:18:57 +0000 (15:18 +0100)]
Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'

* commit '8a4f26206d7914eaf2903954ce97cb7686933382':
  dsputil: remove butterflies_float_interleave.
  srtp: Move a variable to a local scope
  srtp: Add tests for the crypto suite with 32/80 bit HMAC

Conflicts:
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'
Michael Niedermayer [Mon, 21 Jan 2013 14:07:04 +0000 (15:07 +0100)]
Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'

* commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f':
  srtp: cosmetics: Use fewer lines for the test vectors
  srtp: Don't require more input data than what actually is needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'
Michael Niedermayer [Mon, 21 Jan 2013 14:00:45 +0000 (15:00 +0100)]
Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'

* commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610':
  srtp: Improve the minimum encryption buffer size check
  srtp: Add support for a few DTLS-SRTP related crypto suites

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'
Michael Niedermayer [Mon, 21 Jan 2013 13:55:48 +0000 (14:55 +0100)]
Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'

* commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84':
  rtpdec/srtp: Handle CSRC fields being present
  rtpdec: Check the return value from av_new_packet
  ac3dec: fix non-optimal dithering of zero bit mantissas

Conflicts:
libavcodec/ac3dec.c
libavformat/rtpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: fix non-optimal dithering of zero bit mantissas
Michael Niedermayer [Mon, 21 Jan 2013 13:16:34 +0000 (14:16 +0100)]
ac3dec: fix non-optimal dithering of zero bit mantissas

Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5

Based on patch by: Mathias Rauen <madshi@gmail.com> and commit by Justin Ruggles (04ea5491)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd9bf716945046333c24580d538f450b516f15710'
Michael Niedermayer [Mon, 21 Jan 2013 13:10:26 +0000 (14:10 +0100)]
Merge commit 'd9bf716945046333c24580d538f450b516f15710'

* commit 'd9bf716945046333c24580d538f450b516f15710':
  ppc: vorbisdsp: Drop some unnecessary #includes
  avconv: Increase the SDP buffer size to fit xiph SDPs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
Michael Niedermayer [Mon, 21 Jan 2013 13:00:03 +0000 (14:00 +0100)]
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'

* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
  rtpdec: Move setting the parsing flags to the actual depacketizers
  rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

Conflicts:
libavformat/rtpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'
Michael Niedermayer [Mon, 21 Jan 2013 12:52:06 +0000 (13:52 +0100)]
Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

* commit '2326558d5277ec87ba6d607a01ec6acfc51c694c':
  rtpdec: Split mpegts parsing to a normal depacketizer
  rtpdec: Reorder payload handler registration alphabetically

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a717f9904227d7979473bad40c50eb40af41d01d'
Michael Niedermayer [Mon, 21 Jan 2013 12:45:32 +0000 (13:45 +0100)]
Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'

* commit 'a717f9904227d7979473bad40c50eb40af41d01d':
  mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
  rtpdec_mpeg4: Return one AAC AU per AVPacket
  ppc: Include string.h for memset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
Michael Niedermayer [Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)]
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  dsputil: drop non-compliant "fast" qpel mc functions
  get_bits: change the failure condition in init_get_bits

Conflicts:
libavcodec/get_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoEVRC decoder
Paul B Mahol [Wed, 9 Jan 2013 10:56:18 +0000 (10:56 +0000)]
EVRC decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodsputilenc: x86: Convert pixel inline asm to yasm
Daniel Kang [Wed, 16 Jan 2013 07:41:39 +0000 (02:41 -0500)]
dsputilenc: x86: Convert pixel inline asm to yasm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibgsm: detect libgsm header path
Brad Smith [Mon, 21 Jan 2013 01:33:27 +0000 (20:33 -0500)]
libgsm: detect libgsm header path

Libgsm header can reside either in the base include dir or in
the gsm subdir.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agofate: Use wmv2 IDCT for wmv2 tests
Ronald S. Bultje [Sat, 19 Jan 2013 20:04:06 +0000 (12:04 -0800)]
fate: Use wmv2 IDCT for wmv2 tests

6 years agovorbisdsp: change block_size type from int to intptr_t.
Ronald S. Bultje [Mon, 21 Jan 2013 06:26:42 +0000 (22:26 -0800)]
vorbisdsp: change block_size type from int to intptr_t.

This saves one instruction in the x86-64 assembly.

6 years agolavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Ronald S. Bultje [Mon, 21 Jan 2013 06:15:28 +0000 (22:15 -0800)]
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.

This allows us to get rid of them on the next major bump. All of the
above are functionally irrelevant, and most of them are unused, except
the vp3 one, which is used wrongly in the bfin arch optimizations.

6 years agowmv2: move IDCT to its own DSP context.
Ronald S. Bultje [Mon, 21 Jan 2013 06:12:35 +0000 (22:12 -0800)]
wmv2: move IDCT to its own DSP context.

This allows us to remove FF_IDCT_WMV2, which serves no practical purpose
other than to be able to select the WMV2 IDCT for MPEG (or vice versa)
and get corrupt output.

Fate tests for all wmv2-related tests change, because (for some obscure
reason) they forced use of the MPEG IDCT. You would get the same changes
previously by not using -idct simple in the fate test (or replacing it
with -idct auto).

6 years agodsputil: remove butterflies_float_interleave.
Ronald S. Bultje [Mon, 21 Jan 2013 05:57:35 +0000 (21:57 -0800)]
dsputil: remove butterflies_float_interleave.

The function is unused.

6 years agooggdec: #if 0 disabled code
Michael Niedermayer [Sun, 20 Jan 2013 16:50:17 +0000 (17:50 +0100)]
oggdec: #if 0 disabled code

Fixes CID968589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofix memory leak on string reassign
Micah Galizia [Mon, 21 Jan 2013 01:25:30 +0000 (20:25 -0500)]
fix memory leak on string reassign

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes CID968584 and CID968585

6 years agoswr: support first_pts
Michael Niedermayer [Sun, 20 Jan 2013 23:52:14 +0000 (00:52 +0100)]
swr: support first_pts

Trolled-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: fix null checking in avfilter_config_links()
Xi Wang [Sun, 20 Jan 2013 20:38:21 +0000 (15:38 -0500)]
lavfi: fix null checking in avfilter_config_links()

Move the first use of `link' after the null pointer check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoClarify that the recommended audio squeezing/stretching filter is aresample.
Carl Eugen Hoyos [Sun, 20 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Clarify that the recommended audio squeezing/stretching filter is aresample.

Fixes ticket #2036.

6 years agosrtp: Move a variable to a local scope
Martin Storsjö [Sun, 20 Jan 2013 17:06:51 +0000 (19:06 +0200)]
srtp: Move a variable to a local scope

This simplifies the code slightly.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosrtp: cosmetics: Use fewer lines for the test vectors
Martin Storsjö [Fri, 18 Jan 2013 11:46:16 +0000 (13:46 +0200)]
srtp: cosmetics: Use fewer lines for the test vectors

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosrtp: Improve the minimum encryption buffer size check
Martin Storsjö [Fri, 18 Jan 2013 10:33:02 +0000 (12:33 +0200)]
srtp: Improve the minimum encryption buffer size check

This clarifies where the limit number comes from, and only
requires exactly as much padding space as will be needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosrtp: Add tests for the crypto suite with 32/80 bit HMAC
Martin Storsjö [Fri, 18 Jan 2013 11:44:34 +0000 (13:44 +0200)]
srtp: Add tests for the crypto suite with 32/80 bit HMAC

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosrtp: Don't require more input data than what actually is needed
Martin Storsjö [Fri, 18 Jan 2013 10:35:31 +0000 (12:35 +0200)]
srtp: Don't require more input data than what actually is needed

The theoretical minimum for a (not totally well formed) RTCP packet
is 8 bytes, so we shouldn't require 12 bytes as minimum input.

Also return AVERROR_INVALIDDATA instead of 0 if something that is
not a proper packet is given.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosrtp: Add support for a few DTLS-SRTP related crypto suites
Martin Storsjö [Fri, 18 Jan 2013 10:01:33 +0000 (12:01 +0200)]
srtp: Add support for a few DTLS-SRTP related crypto suites

The main difference to the existing suites from RFC 4568 is
that the version with a 32 bit HMAC still uses 80 bit HMAC
for RTCP packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec/srtp: Handle CSRC fields being present
Martin Storsjö [Sun, 20 Jan 2013 17:00:18 +0000 (19:00 +0200)]
rtpdec/srtp: Handle CSRC fields being present

This is untested in practice, but follows the spec.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Check the return value from av_new_packet
Martin Storsjö [Sun, 20 Jan 2013 16:31:57 +0000 (18:31 +0200)]
rtpdec: Check the return value from av_new_packet

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocafdec: fix overflow checking in read_header()
Xi Wang [Sun, 20 Jan 2013 20:26:12 +0000 (15:26 -0500)]
cafdec: fix overflow checking in read_header()

Several compilers such as clang/icc/pathscale will optimize the check
pos + size < pos (assuming size > 0) into false, since signed integer
overflow is undefined behavior in C.  This breaks overflow checking.
Use a safe precondition check instead.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvdec: fix integer overflow
Michael Niedermayer [Sun, 20 Jan 2013 19:59:30 +0000 (20:59 +0100)]
wtvdec: fix integer overflow

Fixes CID968583
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: fix non-optimal dithering of zero bit mantissas
Mathias Rauen [Sat, 5 Jan 2013 16:30:31 +0000 (11:30 -0500)]
ac3dec: fix non-optimal dithering of zero bit mantissas

Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoh264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable
Michael Niedermayer [Sun, 20 Jan 2013 19:02:35 +0000 (20:02 +0100)]
h264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable

Fixes CID968587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: print mismatching opcode details in check_opcodes()
Michael Niedermayer [Sun, 20 Jan 2013 19:01:39 +0000 (20:01 +0100)]
h264: print mismatching opcode details in check_opcodes()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: fix use of uninitialized variable
Michael Niedermayer [Sun, 20 Jan 2013 18:50:33 +0000 (19:50 +0100)]
h264: fix use of uninitialized variable

Fixed CID968588

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotheora: support midstream reconfiguration
Michael Niedermayer [Wed, 16 Jan 2013 19:02:37 +0000 (20:02 +0100)]
theora: support midstream reconfiguration

Fixes Ticket868

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: Support chained streams, support replacing streams in multistream files.
Michael Niedermayer [Wed, 16 Jan 2013 18:58:59 +0000 (19:58 +0100)]
oggdec: Support chained streams, support replacing streams in multistream files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:

Changelog

6 years agoppc: vorbisdsp: Drop some unnecessary #includes
Diego Biurrun [Sun, 20 Jan 2013 15:50:04 +0000 (16:50 +0100)]
ppc: vorbisdsp: Drop some unnecessary #includes

Also fixes compilation with AltiVec disabled.

6 years agoavconv: Increase the SDP buffer size to fit xiph SDPs
Martin Storsjö [Thu, 17 Jan 2013 13:34:25 +0000 (15:34 +0200)]
avconv: Increase the SDP buffer size to fit xiph SDPs

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Move setting the parsing flags to the actual depacketizers
Martin Storsjö [Thu, 17 Jan 2013 13:29:12 +0000 (15:29 +0200)]
rtpdec: Move setting the parsing flags to the actual depacketizers

This gets rid of almost all the codec specific details from the
generic rtpdec code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Martin Storsjö [Thu, 17 Jan 2013 13:08:03 +0000 (15:08 +0200)]
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

This also adds checking of mallocs.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Split mpegts parsing to a normal depacketizer
Martin Storsjö [Thu, 17 Jan 2013 12:34:59 +0000 (14:34 +0200)]
rtpdec: Split mpegts parsing to a normal depacketizer

This gets rid of a number of special cases from the common rtpdec
code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Reorder payload handler registration alphabetically
Martin Storsjö [Thu, 17 Jan 2013 12:27:14 +0000 (14:27 +0200)]
rtpdec: Reorder payload handler registration alphabetically

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: add assert to impossible *_valid combination.
Michael Niedermayer [Sun, 20 Jan 2013 16:14:25 +0000 (17:14 +0100)]
vc1dec: add assert to impossible *_valid combination.

This also fixes a warning about uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: Share the cleanup code between the demuxer and lavf-internal parser functions
Martin Storsjö [Sat, 19 Jan 2013 23:59:08 +0000 (01:59 +0200)]
mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions

The lavf-internal parser functions are used when receiving
mpegts over RTP. This fixes memory leaks in this setup.

The normal mpegts demuxer close function was updated in ec7d0d2e in
2004 to fix leaks, but the parsing function used for RTP wasn't
updated and has been leaking ever since.

Signed-off-by: Martin Storsjö <martin@martin.st>