ff_mss12_decode_init: check dimensions

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskaenc: add codec_tag lists back.

This reverts 312645e :
"Do not set codec_tag property for matroska muxers."

Also adds dummy codec_tag lists with codecs
supported in mkv but not in wav / avi.

Fixes ticket #2169.

Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.

This allows to decode LATM-in-mpegts without the LOAS demuxer.

floatdsp: restrict->av_restrict

Fix msvc

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

sanm: Check decoded_size.

This prevents a buffer overflow in rle_decode()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

eval: add function to access the current "wallclock" time.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hls: add missing checks for accessing avoption fields

Fixes null pointer exception and probably other things

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

mlpdec: move ch_assign setup code down to after ch layout is set.

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

mlp: fix channel order.

This fixes a regression introduced with todays merge

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

lavf/hls: broker HTTP options

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavf/segment: exit immediately in case of invalid stream specifier

Avoid duplicated confusing error message, and propagate error code from
the failing avformat_match_stream_specifier() call.

lavf/segment: avoid failure in case -flags +live and -segment_times/frames are specified

The conflict does not apply any longer, since the M3U8 segment target
duration is re-computed every time a new segment is added to the list.

lavf/segment: drop now pointless segment_list_close() function

lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of stream

Should fix immediate playback termination.

In particular, should fix trac ticket #2172.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpenc: fix overflow checking in avc_mp4_find_startcode()
  rtmp: fix buffer overflows in ff_amf_tag_contents()
  rtmp: fix multiple broken overflow checks
  float_dsp: Include config.h for redefining restrict

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'

* commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e':
  dsputil: remove 9/10 bits hpel functions.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'

* commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7':
  dsputil: remove some never-assigned function pointers from the struct.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/swapuv: support all planar yuv pixel formats

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

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

* commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904':
  vorbisdsp: convert x86 simd functions from inline asm to yasm.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'

* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
  vp3dsp: don't do aligned reads on input.
  mlp_parser: cosmetics: re-indent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

mlpdec: remove disabled code, leftover from merge

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

Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'

* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea':
  mlp: implement support for AVCodecContext.request_channel_layout.

Conflicts:
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'

* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
  mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'

* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
  mlpdec: set the channel layout.

Conflicts:
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa'

* commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa':
  mlpdec: TrueHD: use Libav channel order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'

* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
  mlp: store the channel layout for each substream.

Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
  arm: Add some missing header #includes
  floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
  floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.

Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'

* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
  floatdsp: move vector_fmul_add from dsputil to avfloatdsp.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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: Martin Storsjö <martin@martin.st>

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. Also change a literal buffer
size to use sizeof, and limit the amount of data copied in another
memcpy call as well.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

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: Martin Storsjö <martin@martin.st>

adcpmenc: remove unused header

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

jpeglsenc: add missing put_bits.h header

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

ffv1enc: include correct header

Encoder needs put_bits.h, not get_bits.h

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

dcaenc: remove unused header

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

flacenc: include correct header

Encoder needs put_bits.h, not get_bits.h

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

float_dsp: Include config.h for redefining restrict

This makes sure that the restrict keyword is mapped to whatever
keyword the compiler prefers/supports. This fixes building on MSVC
(and possibly on GCC 2.x as well).

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

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>

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>

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>

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>

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>

dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

dsputil: remove 9/10 bits hpel functions.

These are never used.

dsputil: remove some never-assigned function pointers from the struct.

dsputil: remove avg_no_rnd_pixels8.

This is never used.

Drop DCTELEM typedef

It does not help as an abstraction and adds dsputil dependencies.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

vorbisdsp: convert x86 simd functions from inline asm to yasm.

vp3dsp: don't do aligned reads on input.

The input is not guaranteed to be aligned.

mvdec: check channel count.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mvdec: minor simplification, remove av_inv_q()

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

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>

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>

mlp: implement support for AVCodecContext.request_channel_layout.

Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

Allows users to configure the output based on what's actually decoded, rather than the full native layout.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

mlpdec: set the channel layout.

Fixes bug 401.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

mlpdec: TrueHD: use Libav channel order.

Fixes bug 208.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

mlp: store the channel layout for each substream.

Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

mlp_parser: cosmetics: re-indent.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

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>

arm: Add some missing header #includes

floatdsp: move butterflies_float from dsputil to avfloatdsp.

This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3)
independent of dsputil.

floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.

Now, nellymoserenc and aacenc no longer depends on dsputil. Independent
of this patch, wmaprodec also does not depend on dsputil, so I removed
it from there also.

floatdsp: move vector_fmul_add from dsputil to avfloatdsp.

floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

This makes the aac decoder and all voice codecs independent of dsputil.

lagarith: return more meaningful error codes

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

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.

Fix compilation with --disable-everything --enable-demuxer=loas

lavf/aiffenc: ID3 tags support

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

lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs

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).

Support solid gray frames when decoding Lagarith.

Fixes bug 431.

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>

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>

rtpenc: do not use random values for seq when bitexact is requested.

Fixes fate

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

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>

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>

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>

Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

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

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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>

mov: prevent double free if the caller replaces the io context.

Fixes Ticket2148

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

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>

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.

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>

x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

CC: libav-stable@libav.org

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>

avf_showwaves: fix null pointer dereference

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

doc/swr: More verbose description of the force resample flag.

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

doc/swr: elaborate on what the LFE mix level is.

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

doc/swr: typo fix

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

doc/swr: docu lfe mix level unit & range

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

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>

doc/swr: Mention that the internal sample format is choosen automatically if not set

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

docs/swr: better used_channel_count docs

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

img2dec: support seeking in infinitely looped stream

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