Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
tests/fate/video.mak

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

Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

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

Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

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

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
libswscale/utils.c
libswscale/version.h

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

Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'

* commit '74652af821d7e526a6541876a637fbf81261fa8e':
  pixdesc: add function to return pixel format with swapped endiannes

Conflicts:
libavutil/pixdesc.c
libavutil/version.h

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

Add FATE test for matroska error recovery.

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip

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

jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/mpsub: remove sscanf from probing.

This should make probing faster.

Cosmetics: Fix indentation and add braces after last commit.

vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.

Fixes mplayer -vc ffvc1vdpau for interlaced streams.

Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

fate-jpeg2000-dcinema: force output to xyz12le

Fixes Fate tests on big-endian configs.

vf_scale: add endianness conversion pixel format in query_formats

swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Use alpha from the right row in yuva2rgba_c

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

Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
  swscale: Remove unnecessary backslashes
  jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Conflicts:
libavcodec/jpeg2000dec.c

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

jpeg2000: fix for uninitialized data errors in valgrind/memcheck

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

Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
libavcodec/x86/Makefile

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

Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'

* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
  x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

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

Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'

* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
  x86: More specific ifdefs for dsputil/hpeldsp init functions

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

swscale: add support for endianness only conversion

Use bitfields in FormatEntry array to avoid wasting an int for each flag.

pixdesc: add function to return pixel format with swapped endiannes

snow: add av_cold where appropriate

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

avfilter: add av_cold to uninit()

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

swscale: Use alpha from the right row in yuva2rgba_c

Every other pixel had the alpha channel taken from the wrong
row.

This fixes bug 504.

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

swscale: Remove unnecessary backslashes

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

j2kdec: frame multithreading support

This allows comparing the 2 decoders with threads

Based on:commit 2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b
By: Nicolas Bertrand <nicoinattendu@gmail.com>

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

lavfi/deshake_opencl: use ff_opencl_set_parameter

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

jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove a superfluous include from libavcodec/options_table.h.

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

Remove a superfluous include from libavcodec/options_table.h.

lavfi/unsharp_opencl: use av_opencl_errstr

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

lavu/opencl_internal: use av_opencl_errstr

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

lavfi/unsharp: fix opencl crash on 64bit linux

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

x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.

x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

x86: More specific ifdefs for dsputil/hpeldsp init functions

wav_seek_tag: fix integer overflow

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: Always seek to an even offset

Conflicts:
libavformat/wavdec.c

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

Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

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

Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'

* commit 'bd8ac882140a38868c33c000a430a1292a352533':
  avcodec: Add av_cold attributes to end functions missing them

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

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

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

wav: Always seek to an even offset

RIFF chunks are aligned to 16bit according to the specification.

Bug-Id:500
CC:libav-stable@libav.org

nut: use a define for the nut version

Ease switching version in the future and make evident why that value.

id3v2: stop ignoring text encoding for chapter titles

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

h264: check mb_width/height

Fixes inconsistency that leads to out of array accesses with threads

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

ff_h264_decode_seq_parameter_set: dont set h->sps

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

h264_sei/decode_picture_timing: do not depend on h->sps being set

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

ff_h264_decode_picture_parameter_set: fix return code

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

ff_h264_decode_picture_parameter_set: use the correct sps

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

bgmc: Do not mark ff_bgmc_decode_init() as av_cold

The function is possibly called once per block.

avcodec: Add av_cold attributes to end functions missing them

Cosmetics: Reindent Sierra vmd demuxer after last commit.

Support demuxing of audio-only vmd files.

Reviewed-by: Paul B Mahol

Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.

avformat: Add av_cold attributes to init functions missing them

Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg

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

configure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"

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

configure: set valgrind-memcheck toolchain when --valgrind is specified

This avoids duplicating the default command line arguments

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

register AV_PIX_FMT_VDPAU for hwaccel

fix vdpau vc1 interlace modes

avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()

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

lavu/opencl: add opencl public error API

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

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

Demuxers where the changed code looked less readable where skiped

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

make the ordering of the return type and av_cold consistent

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for getenv

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

Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
libswscale/utils.c

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

Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'

* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
  avutil: Add av_cold attributes to init functions missing them

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

Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
  lavfi: let gcc realign the stack on public graph driving functions

Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c

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

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
  sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
  avs: Increase magic value score above file extension score

Conflicts:
libavformat/avs.c

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

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
  avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c

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

Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'

* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
  build: output-example: Add avutil to ELIBS in link command

Conflicts:
libavformat/Makefile

No change as our example build code doesnt have this bug

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

Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'

* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
  avresample: Add av_cold attributes to init functions missing them

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

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c

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

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
  avcodec: Add av_cold attributes to init functions missing them

Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c

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

Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

* commit '72e228b274a98af1aba9588415d0cd87fde44663':
  nut: K&R formatting cosmetics

Conflicts:
libavformat/nut.c

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

configure: fix valgrind-memcheck arguments

They now match the --valgrind arguments

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

Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'

* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a':
  configure: Add basic valgrind-memcheck support

Conflicts:
configure

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

Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
tests/Makefile

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

Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'

* commit '768e44d044bc32de1e58c198a3708d186af7e966':
  build: tune down the output of lcov/gcov

Conflicts:
tests/Makefile

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

Detect and skip mj2-style jp2c header.

This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Avoid incorrect deprecated pixel format warning.

Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

AAC encoder: Fix rate control on twoloop.

Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

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

AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.

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

src_movie: fix scanf string

Fixes out of array accesses

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

xbmdec: fix off by one error in scanf()

Fixes out of array access

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

configure: Check for getenv

When targeting the "windows store application" (metro) API subset
(or the windows phone API subset), the getenv function isn't
available. If it is unavailable, just define getenv to NULL.

The check uses check_func_headers, since the function actually
might exist in the libraries, but is hidden in the headers.

The fallback is in config.h since msvc can't do -D defines with
parameters on the command line, and it's used both within the
libraries and the frontend applications (so a libavutil internal
header wouldn't be enough).

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

swscale: Add av_cold attributes to init functions missing them

avutil: Add av_cold attributes to init functions missing them

lavfi: let gcc realign the stack on public graph driving functions

The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.

This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.

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

sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes

avs: Increase magic value score above file extension score

This should fix misdetection of AVS files as AviSynth scripts
when AviSynth support is enabled (Bugzilla #357).

avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

build: output-example: Add avutil to ELIBS in link command

output-example links against swscale, which depends on avutil.  In standard
configurations, by pure good luck, the libs before swscale pull in all of
swscale's dependencies and linking succeeds.  However, in some configurations
like --disable-asm this is not the case and linking fails.

Hardcode the dependency to avoid a more general Makefile refactoring.

avresample: Add av_cold attributes to init functions missing them

avfilter: Add av_cold attributes to init/uninit functions

avcodec: Add av_cold attributes to init functions missing them

h264: Always decode MMCOs into temprary array

When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure

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