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>

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>

riff: check for eof if chunk size and code are 0

Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>

riff: K&R formatting cosmetics

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

lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers

lavfi/sendcmd: fix various "in in" rerepepetitions in messages

lavfi/buffersink: fix possible leaks after allocation failures.

Should fix Coverity CID 1005313, 1005314, 1005315.

lavfi: add asetrate filter.

ffmpeg_filter: fix leak on error

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

init_vlc_sparse: fix leak on error

Fixes CID1005312

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

libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484

Current method for constraining fragment position drift suffers from
round-off error build up.

Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/af_atempo: Fix uninitialized memory access

valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: hpeldsp: Include attributes.h

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

qdm2: initialize coeff_per_sb_select from bit_rate

The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.

Fixes tickets #1868 and #742 (only audio part)

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

mxf_timestamp_to_str: dont leave uninitilaized fields in time.

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

av_samples_alloc_array_and_samples: Fix sizeof type.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only do early frame drop if video queue is not empty
  ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
  ffplay: simplify aspect ratio calculation

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

avcodec/mpegvideo: change asserts to av_asserts

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

avfilter/deshake_kernel: fix reset value bug of deshake kernel

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

lavfi/stereo3d: support more formats for non-anaglyph outputs

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

ffplay: only do early frame drop if video queue is not empty

Fixes ticket #2446.

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

ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0

Assuming 0 pts may lead to bad framedrop decisions...

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

ffplay: simplify aspect ratio calculation

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

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

Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'

* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
  cosmetics: bfin: Fix indentation in the dsputil init function

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

Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'

* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
  dsputil: Remove non-8bpp draw_edge

Conflicts:
libavcodec/dsputil.c

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

Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'

* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
  dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

Conflicts:
libavcodec/dsputil.c

No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.

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