Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
libavcodec/pcx.c

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

Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'

* commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a':
  truemotion1: make sure index does not go out of bounds

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

Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'

* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
  avidec: fix a memleak in the dv init code.

Conflicts:
libavformat/avidec.c

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

Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
libavcodec/vc1dec.c

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

Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

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

Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'

* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

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

Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
libavformat/matroskadec.c

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

Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
libavcodec/h264.c

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

Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'

* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
  gifdec: convert to bytestream2

Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h

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

avcodec/gifdec: print error if image is not within dimensions

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

Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'

* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
  gifdec: check that the image dimensions are non-zero

Conflicts:
libavcodec/gifdec.c

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

Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'

* commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13':
  h264_cavlc: check the size of the intra PCM data.

This check is redundant, but does no harm

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

avformat/avidec: Skip duplicate strf chunks

Fixes Ticket3119

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

hevc : add hevc profile

(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)

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

hevc : update hevc_ps.c

(cherry picked from commit 088f2eb1ae42bffc63c2cee4e7eba8f47056043b)

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

avformat/avidec: also print position in print_tag()

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

doc/examples: do not check NULL values for avcodec_close()

avcodec_close() does nothing in case the argument is NULL. Simplify.

lavfi/aevalsrc: initialize pointer to expression to NULL

Fix crash in case of expression parsing failure.

avcodec/x86/vp9dsp: merge a few SWAP together.

hevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba365807223e96a67d6c0ed)

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

hevc : fix pcm(cherry picked from commit 12bbfdba1899d11044d2bd8457159fc8b4b52a76)

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

pcx: round up in bits->bytes conversion in a buffer size check

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

truemotion1: make sure index does not go out of bounds

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

avidec: fix a memleak in the dv init code.

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

vc1: fix a memleak.

Happens on a B-frame when neither low_delay nor last_picture_ptr is set
(probably corrupted streams only).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

motionpixels: clip VLC codes.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

matroskadec: use correct compression parameters for current track CodecPrivate

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>

matroskadec: pad EBML_BIN data.

It might be passed to code requiring padding, such as lzo decompression.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: check buffer size before accessing it

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

gifdec: convert to bytestream2

gifdec: check that the image dimensions are non-zero

Also add an error message an return a more suitable error code
(INVALIDDATA, not EINVAL);
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264_cavlc: check the size of the intra PCM data.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c

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

Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
doc/filters.texi

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

Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'

* commit 'd28fc7b29a728bd2f88c10121abbd0442c341746':
  avconv_filter: add new line after error message

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

Merge commit '874838dc6589d978611c89a40694a5074f892a76'

* commit '874838dc6589d978611c89a40694a5074f892a76':
  fate: add one select filter test

Conflicts:
tests/fate/filter-video.mak

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

Merge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'

* commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf':
  mpeg4videoenc: restore macro parentheses

No change, as the bug was spoted by ubitux and not merged

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

cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile

might fix Ticket3056

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

dct/fft: Give consistent names to fixed/float template files

filter docs: reference scale and fps filters

avconv_filter: add new line after error message

Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec

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

avcodec/utils: remove unused variable

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

fate: add one select filter test

This test selects alternate frames from input.

mpeg4videoenc: restore macro parentheses

These were erroneously removed in 8769113accf1f3b78634dec60b37f7354ed6d88d.

cmdutils: randomize spaces after 69cf626f9.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Avoid requiring c99wrap for working around msys path issues

Conflicts:
configure

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

Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'

* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
  libxavs: rename and fix a variable name

Conflicts:
libavcodec/libxavs.c

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

configure: Avoid requiring c99wrap for working around msys path issues

Msys is unable to convert unix style absolute paths to windows style
paths when combined with certain multichar MSVC options such as
-Fo<file>. We used to work around this issue by passing them as two
separate parameters separated by a space to c99wrap, which then mapped
them back to the actual parameter format that MSVC uses.

The only paths that actually are an issue are absolute unix style
paths, and the only place such absolute paths are used with the output
arguments (-Fo, -Fe, -Fi, -out:) are for the temp files within configure.

By setting TMPDIR to . for msvc/icl builds, we never need to use
absolute unix style paths for the file output, and we can use the
actual proper form of the file output parameters. This avoids requiring
the c99wrap wrapper for remapping the parameters for cases where the
c99 converter isn't invoked at all (MSVC2013 and ICL).

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

avformat/utils: inject audio skip side data before the side data merge code

This ensures that its handled the same way as other side data

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

avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()

This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.

avformat/utils: move side data merge after parser

merging before the parser can conflict with the parser, also
future changes depend on it being done later

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

libxavs: rename and fix a variable name

It was mis-spelled in b18c7c8d3ddfbf171fe0aba1c201a002920af7f7.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

avcodec/avpacket: fix order of operations in case of too large allocation

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

avcodec/utils: use the unpack_dictionary function

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/avpacket: use size_t, fix potential integer overflow

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

Document new APIs for av_packet_{un, }pack_dictionary()

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avpacket: add pack/unpack functions for AVDictionary

These functions are intended for use with side_data which comes in an
AVPacket.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec: add side_data type for updated metadata

This type is intended to be used to allow codecs to pass updated
metadata to applications.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/showspectrum: use 0 dummies for range in const.

This is consistent with other options.

avfilter/showspectrum: reindent const options.

avfilter/showspectrum: add blackman window.

avfilter/showspectrum: add win_func option.

vda_h264_dec: backup context before overriding

Some of context fields which must be overrided by this wrapper decoder
may be set and used by user, so we have to save and restore them before
and after invoking the inner decoder to secure user.

fate: test -mbd rd for h261

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

avcodec/h261enc: dont use current_mv_x/y

Fixes -mbd rd
Fixes Ticket3151

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

avcodec/h261enc: avoid use of current/previous_mba

Fixes part of Ticket3151

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  win{32,64}: Hard disable symbol versioning

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

Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'

* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79':
  ac3dec: simplify an expression

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

ffmpeg: fix do_streamcopy() so it copies side data too

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

avcodec/avpacket: correctly set the number of side data elements in av_copy_packet_side_data()

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

cmdutils: cosmetics

requested by multiple people

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

doc/muxers/segment: remove wrong default indication for segment_list_flags option

swscale/x86: SIMD deinterleaveBytes() depends on YASM

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

win{32,64}: Hard disable symbol versioning

ICL doesn't return an error on unknown parameters, and will
always pass the symver_gnu_asm test, and since Windows
never has symbol versioning, just always disable it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

cmdutils: Add -buildconf option.

The output is formatted to display one option per line.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

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

riff: add DYM4 mpeg4 fourcc

ac3dec: simplify an expression

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'

* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
  avcodec.h: include version.h before using version macro

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

avfilter/vf_tinterlace: check clone return value

Inspired by: 3a16ec19d2426457419cb8a7304f97982699efda

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

Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'

* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

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

Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'

* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
  hevc_sei: drop unused parameter

Conflicts:
libavcodec/hevc_sei.c

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

Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4videodec.c

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

Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'

* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4videoenc.c

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

dv_tablegen: Remove CONFIG_SMALL preprocessor check

The code does in no way depend on CONFIG_SMALL.

swscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytes

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

swscale/x86/rgb2rgb: change cpu optim identifiers to lower case

This makes the code more similar to the other optims and allows us
to use the same macros to build function names

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

swscale/x86/rgb2rgb: extend framework to also include AVX

This does not yet include any actual AVX code

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

swscale: fix used stride in planarToNv12Wrapper()

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

swscale: add nv12/nv21->yuv420 converter

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

avcodec.h: include version.h before using version macro

vf_interlace: check one av_frame_clone allocation

hevc_sei: drop unused parameter

mpeg4videodec: K&R formatting cosmetics

mpeg4videoenc: K&R formatting cosmetics

avformat/jacosubdec: make probing less tolerant.

Fixes a failure with probetest:
  ./tools/probetest 8192 500000
  [...]
  Failure of jacosub probing code with score=51 type=1 p=CAB size=16

Random data was:
  00000000  40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Don't use symlinks for creating the out of tree makefile

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

doc/examples: fix mem issues in filtering_video.

configure: Don't use symlinks for creating the out of tree makefile

On some platforms (such as msys), symlinks are (poorly) emulated
by simply creating a copy of the file.

This means that when building out of tree, the build tree gets
a copy of the original makefile, which can lead to unintuitive
build errors when the original makefile gets updated later.

Instead simply create a stub makefile which includes the real
one.

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