Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'

* commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

Conflicts:
libavformat/rtmpproto.c

See: 0c2a6dabced53b4df57aedf47f0c1b8233035fed
See: 02ac3398eb52679301028c2fd3ebad1b6261b4da
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/exr: mark gama option as experimental / unsupported

Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/exr: Add a gamma flag to exr loader to avoid banding

This is needed to avoid banding artifacts when gammaing the picture.
Currently, if done with a video filter, the process is done on uints
instead of full float.

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

avformat/rtmpproto: add FFMIN() to av_strlcpy()

Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtmpproto: Check the buffer sizes when copying app/playpath strings

As pointed out by Reimar Döffinger.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/mjpegdec: zero gb to silence warning about it being possibly uninitialized

The code is not speed relevant, also its more robust if the pointers are NULL instead of random.

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

avcodec/takdec: Always initialize hsize, silence "may be used uninitialized" warning

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

avcodec/dcadec: add an assert to silence a uninitialized variable warning

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

avcodec/dcadec: remove always true if()

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

avcodec/cinepakenc: Fix "may be used uninitialized in this function" warnings

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

avfilter/af_compand: Silence "may be used uninitialized" warning

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavc: use av_fifo_freep
  lavf: use av_fifo_freep
  ffmpeg: use av_fifo_freep
  lavd/jack_audio: use av_fifo_freep
  lavfi: use av_fifo_freep
  lavu/fifo: add av_fifo_freep function

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

lavc: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavf: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

ffmpeg: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/jack_audio: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavfi: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavu/fifo: add av_fifo_freep function

Function allows to free fifo and reset freed pointer.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

avcodec/huffyuvenc: Make version 3 of ffvhuff non experimental

Tested-by: Tim Nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/cinepakenc: drop coded_frame init

Fixes const being lost warning

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

avcodec/cinepakenc: Zero AVPictures, silence "may be used uninitialized" warnings

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

avcodec/eamad: silence uninitialized variable warnings

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

avcodec/ac3enc: silence 2 warnings about "possibly uninitialized" variables

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

avfilter/aeval: silence "may be used uninitialized" warning

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

inline asm: fix arrays as named constraints.

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

avformat/utils: fix const warnings

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

cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL

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

avformat/h263dec/h263_probe: Check TR

Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/h263dec/h263_probe: Check PSC bit 9 and 13 in

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

avformat/h263dec: shift data in state to make more bits available to probe

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

avcodec/wavpack: initialize pointers to silence warning about them possibly being uninitialized

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

avcodec/hevc: remove unused variable

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

swresample/resample: add missing xmm clobbers

Might fix fate-swr on ICL

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

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

rtmpproto: Support alternative slist parameter in rtmp URLs

Support the URL scheme where the playpath is in an RTMP URL is
passed as the slist argument and the app is given infront of the
query part of the URL:

rtmp://host[:port]/[app]?slist=[playpath]

(other arguments in the query part are stripped as they are not used)

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

avcodec/x86/hevcdsp_init: fix SSE4 checks

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/Makefile: remove duplicate line

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

avcodec/x86/hevcdsp_init: fix build on 32bit

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

HEVC : added assembly MC functions

pretty print x86

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hevc: C code update for new motion compensation

pretty print C

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: always reset pes packet state on new packet
  mpegts: unref buffer in reset_pes_packet_state
  mpegts: factorize pes packet state reset function
  mpegts: fix indentation after last commit
  mpegts: only emit new packets if data buffer exists
  mpegts: remove uneeded buf_size check

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

x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external

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

gitignore: add tools/uncoded_frame

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc()

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

avcodec/mpeg4videodec: fix mcbpc error messages

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

avcodec/snowenc: Fix "incompatible pointer type" warning

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

avfilter/af_bs2b: Fix incompatible pointer type warnings

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

avcodec/svq3: Fix "incompatible pointer type" warnings

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

avformat/segment: Use av_malloc_array()

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

mpegts: always reset pes packet state on new packet

Fixes ticket #3584.

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: unref buffer in reset_pes_packet_state

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: factorize pes packet state reset function

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: fix indentation after last commit

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: only emit new packets if data buffer exists

I don't think this can acutally happen in the current code, but better safe
than sorry.

Fixes Coverity CID 732217.

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: remove uneeded buf_size check

It is already ensured by the loop condition

Signed-off-by: Marton Balint <cus@passwd.hu>

avutil/file_open: Use av_mallocz_array()

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

tests/tiny_ssim: more correct error message

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

avutil/audio_fifo: Use av_mallocz_array()

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

tools/ismindex: use av_mallocz_array()

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

tests/tiny_ssim: check dimensions

Fix integer overflow

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

lavu/fifo: add const to arguments

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/astenc: avoid using AVCodecContext.frame_number

Theres no gurantee that the user application has initialized it

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

Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'

* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
ffmpeg.c
ffmpeg.h

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

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

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

Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
ffmpeg.c

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

Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
ffmpeg.c

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

Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
ffmpeg.c

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

Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
ffmpeg.c

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

libfdk-aac: Relicense the library wrappers to 2-clause BSD

This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).

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

libfdk-aacenc: Enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.

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

Fix standalone compilation of sonic lossless encoder.

avfilter/f_select: fix incompatible pointer type warning

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

avcodec/lossless_videodsp: fix incompatible pointer type warning

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

avisynth: set duration of audio streams

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

swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array()

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

avutil/pca: Use av_malloc_array()

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

MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Map --enable-lto to -ipo when compiling with icc.
  Disable inline_asm_direct_symbol_refs if lto was requested.

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

Map --enable-lto to -ipo when compiling with icc.

Disable inline_asm_direct_symbol_refs if lto was requested.

This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.

lavf/mux: pass options to nested structs of priv data

This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h263dec: use AV_EF_IGNORE_ERR

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

avformat: add AV_EF_IGNORE_ERR

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

avcodec: add AV_EF_IGNORE_ERR

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

doc/codecs: document ignore_err

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

avfilter/lut3d: support 3DLUTSIZE directive for Davinci files.

Fixes Ticket #2847.

MAINTAINERS: add myself as lavd/xv maintainer

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Maintainers: add myself for msvc and icl.

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

Enable inline asm in intel compiler on windows.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Initialize riff and wav size fields to -1 instead of 0.

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

Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'

* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
libavformat/utils.c

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

Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
libavutil/mathematics.c

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

Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

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

Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

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

Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

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

Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flvdec.c

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

avcodec/jpeglsdec: add cast to silence pointer type warning

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