Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
doc/APIchanges
tests/fate/h264.mak

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

lavc: remove unused put_bits.h headers

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

lavfi/subtitles: zero-init AVSubtitle.

This avoids invalid free when the stream id doesn't match the packet
stream index.

Ticket #2501

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: check decoded subtitles encoding.
  lavu: fix GET_UTF8 macro.

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

vc1dec: drop old use_ic code from vc1_b_mc

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

vc1: use use_ic instead of shuffling mv_mode around

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

vc1dec: Implement intensity compensation for vc1_interp_mc()

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

vc1dec: redesign the intensity compensation

The existing implementation had little to do with VC1.
This could be implemented by adjusting the reference frames
ithemselfs but that would make frame multi-threading difficult.

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

lavfi: add timeline support in {de,remove}logo.

Both don't change anything in the context between frames.

lavc: check decoded subtitles encoding.

Address trac ticket #2431.

lavu: fix GET_UTF8 macro.

Prevent 0xFE and 0xFF from being considered the start of
non-standard 7-bytes sequences. No noticeable effect on speed.

lavfi: add vidstabutils.h to SKIPHEADERS.

Fix checkheaders when vid.stab is not available.

lavfi/vidstabdetect: fix direct path.

The frame must be writable if the show option is set, otherwise pass the
frame unchanged.

lavfi/vidstab: remove mention of defaults for consistency with other filters.

lavfi/vidstab: make use of direct variable.

lavfi/vidstab: add missing flags for 2 options.

doc/filters: reword vidstab options intro.

lavfi/vidstab: consistent descriptions.

lavfi/vidstab: miscelenaous cosmetics and typo fixes.

lavfi: add video stabilization plugins using vid.stab library

vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c

Signed-off-by: Georg Martius <martius@mis.mpg.de>

doc/filters: amend documentation for the hue filter

Make clear that the options accept an expression.

doc/filters: introduce example in vflip filter

doc/filters: split luma/chroma descriptions for unsharp option

Honour declaration order in filter implementation, for shorthand
consistency.

fate: add CVFC1_Sony_C to h264 conformance tests

The sample is already included in the FATE suite, but is not tested
because cropping wasn't fully supported before.

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

MAINTAINERS: add jpeg2000 maintainer

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

vc1: make INIT_LUT() self contained

factorize variable declarations

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

vc1dec: fix current ptr selection in vc1_mc_4mv_chroma()

No sample tried shows a difference

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

vc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma()

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

vc1dec: factorize picture pointer selection code

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

vc1dec: Fix mv_f shuffling

Avoid a (confusing) memcpy()
Simpler code
Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos

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

vc1dec: Fix mv_f shuffling

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

vc1: simplify code use INIT_LUT()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Get rid of duplication between *_rnd_template.c

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

Merge commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77'

* commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77':
  mpegvideo: unref cur/next/prev frames when flushing

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

Merge commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223'

* commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223':
  x86: Factorize duplicated inline assembly snippets

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

Merge commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b'

* commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b':
  jpeg2000: Add mutlti-threading support to decoder

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

doc/APIchanges: add missing hashes and dates

avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2

    This should fix building with MSVC until someone can change the
    code so it works with MSVC

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

doc/filters: sort multimedia filters by name

Also favor the video filter name for indexing, in case there is an a*
audio filter variant.

lavfi/hue: rework logic for setting commands

In particular, fix h/H commands in case h and H are not specified as
initial parameters.

x86: Get rid of duplication between *_rnd_template.c

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

mpegvideo: unref cur/next/prev frames when flushing

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Read block_align from extradata when decoding qclp in aiff.

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

Read block_align from extradata when decoding qclp in aiff.

Fixes ticket #1287.

doc/filters: document geq rgb mode

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

avfilter/geq: rgb support

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

avformat: fix orig_pos type to match pkt->pos

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

x86: Factorize duplicated inline assembly snippets

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

avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC

This should fix building with MSVC until someone can change the
code so it works with MSVC

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

jpeg2000: Add mutlti-threading support to decoder

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Move some conditional code around to avoid unused variable warnings

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c

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

Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'

* commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d':
  jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12

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

Merge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7'

* commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7':
  threads: always call thread_finish_setup for intra codecs

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

avfilter/drawtext: add pict_type support

Fixes Ticket2470

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

lavfi/overlay: support timeline through the new system.

lavfi: add 'enable' command injection to filters supporting timeline.

lavfi: add timeline support.

Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.

lavfi: add frame counter into AVFilterLink and use it in filters.

mjpegdec: Add support for 4:1:1 YUV

Fixes part of ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec_get_context_defaults3: set codec_id

Fixes Ticket1996

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak

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

avcodec: rename jpeg2000 decoder to j2k

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

Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'

* commit '0c15a9aa7e1654a19144eb594f9639a57fd47482':
  sh4: Remove dubious aligned dsputil code

Conflicts:
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/h264chroma_init.c
libavcodec/sh4/hpeldsp.c
libavcodec/sh4/qpel.c

If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!

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

Merge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85'

* commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85':
  x86: cavs: Refactor duplicate dspfunc macro

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

Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a':
  mxfenc: Use correct printf format specifier for int64_t
  h264: Drop unused variable

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

Merge commit '78fa0bd0f7067868943c0899907e313414492426'

* commit '78fa0bd0f7067868943c0899907e313414492426':
  x86: cavs: Put mmx-specific code into its own init function

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

x86: Move some conditional code around to avoid unused variable warnings

jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12

threads: always call thread_finish_setup for intra codecs

Intra codecs do not need an update_thread_context() function and never
call ff_thread_finish_setup(). They rely on ff_thread_get_buffer()
calling it. So call it even if the get_buffer2 function pointer is
avcodec_default_get_buffer2 and it has not been called before.

avcodec: Bump minor for JPEG 2000 decoder

JPEG 2000 decoder for DCinema

Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

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

lavu/opencl:optimize compile kernel operation

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

fate: re-enable af_join test

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

lavfi: remove mp=down3dright

Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.

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

doc/filters: add examples for stereo3d

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove some duplicate function declarations

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

Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'

* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

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

Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'

* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
libavformat/riff.c

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

Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'

* commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25':
  riff: Add ACTRAC3+ guid

No change, this commit was in ffmpeg already with this formating

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

Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'

* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
  riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Conflicts:
libavformat/riff.c

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

Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'

* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
  riff: Move guid structs and helper functions into riff

Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c

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

sh4: Remove dubious aligned dsputil code

The code represents a considerable maintenance burden and it is not
clear that it gives a noticeable benefit to outweigh this after 10
years of improvements in compiler technology since its creation.

x86: cavs: Refactor duplicate dspfunc macro

mxfenc: Use correct printf format specifier for int64_t

libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]

h264: Drop unused variable

Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'

* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0':
  riff: check for eof if chunk size and code are 0

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

Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
libavformat/riff.c

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

x86: cavs: Put mmx-specific code into its own init function

Before, this code was labeled as mmxext and enabled both for the
3dnow and the mmxext case.

x86: Remove some duplicate function declarations

afifo: fix request_samples on the last frame in certain cases

The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

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

indeo4: implement haar 8x1 and 1x8 transforms

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

lavfi/fade: Added ability to do video fade based on timestamp

ismindex: check mkdir()s return code

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

tools/ismindex: dont ignore return code of write_fragments()

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

ffplay: check av_samples_get_buffer_size() return

Fixes CID1005310
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi: add interleave filters

riff: Factor out WAVEFORMATEX parsing

Makes the code simpler to follow.

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

riff: Add ACTRAC3+ guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

riff: Move guid structs and helper functions into riff

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>