avformat/asfdec_f: Increase the amount of information provided in cases of errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Add support for TEA (Tiny Encryption Algorithm)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: rename async_interrupt_callback to async_check_interrupt

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: fix interrupt_callback usage and return code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'

* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
  dds: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'

* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
  hap: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

libavfilter/vf_crop: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavfilter/vf_scale: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: silence some deprecation warnings

And prevent eventual compilation failures once the relevant functions
and fields are removed.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/options-test: don't alloc avctx->coded_frame

It's done automatically by avcodec_open2() now.
Fixes memleaks in fate-libavcodec-options.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec: loongson optimize blockdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()

Avoids memleak if querry_formats is not called

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: Add missing else

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'

* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

tests/checkasm/Makefile: Fix checkasm with SDL

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fate: add test for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hapdec: log reason for failure when texture type doesn't match stream

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: loongson optimize xvid idct with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: loongson move simple idct functions to a separate file

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

aacenc: move the generation of ff_aac_pow34sf_tab[]

This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.

This is the first commit which cleans up the encoder a little.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

dds: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

hap: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About 5x speedup (from 60ms to 12ms to decode a 4k frame).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

parseutil: Use non ambiguous aliases for uhd

uhd1 and uhd2 would be ambigous.

MAINTAINERS: add myself as a maintainer for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hapdec: don't log texture format every frame, do it once per decode session

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/hap: remove unused struct member

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/hap: Name enums

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacsbr: fix compilation with hardcoded tables

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

Merge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'

* commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069':
  arm: use a local label instead of the function symbol in ff_prefetch_arm

See: cab6302534962331753fb69c674df86a458b098d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'

* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
  h264: aarch64: intra prediction optimisations

Conflicts:
libavcodec/h264pred.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'

* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
  Deprecate avctx.coded_frame

Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Do not merge side data for encoders

With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'

* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
  Gather all coded_frame allocations and free functions to a single place

Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

arm: use a local label instead of the function symbol in ff_prefetch_arm

Avoids a relocation which might end out of range for thumb2.

Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org

h264: aarch64: intra prediction optimisations

Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'

* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
  flashsvenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'

* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
  ffv1enc: Use input frame to set SAR and interlacing

Conflicts:
libavcodec/ffv1enc.c

No change as the removed coded_frame uses where not in the code anymore

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'

* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
  ffv1enc: Keep coded_frame.key_frame a write-only variable

Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'

* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162':
  qtrleenc: Keep coded_frame.key_frame a write-only variable

Conflicts:
libavcodec/qtrleenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'

* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
  libvpxenc: Do not entangle coded_frame

Conflicts:
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'

* commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e':
  libxvid: Do not entangle coded_frame

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'

* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
  svq1enc: Do not entangle coded_frame

Conflicts:
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'

* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
  proresenc: Do not entangle coded_frame

Conflicts:
libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '91767360d86ac786571593ab11c7291010ab3829'

* commit '91767360d86ac786571593ab11c7291010ab3829':
  a64multienc: Do not entangle coded_frame

Conflicts:
libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'

* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
  mpegvideo_enc: Drop unnneded initialization

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: check for erf() and copysign()

They are not available on some compilers.

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

x86/vf_ssim: add ff_ssim_4x4_line_xop

~20% faster than ssse3. Also enabled for x86_32

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

x86/vf_ssim: fix some instruction comments

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

Adding myself as maintainer for qsv*

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/arm/intmath: return int for uint8 / uint16 clip

The C functions return uint8/16_t but that is effectively int not unsigned int
Fixes fate-filter-tblend

We do not return uint8/16_t as that would require the compiler to truncate the
values, slowing it down.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Implementation of AAC_fixed_decoder (SBR-module)

Add fixed poind code.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Table creation for AAC_fixed_decoder (SBR-module)

Create tables for fixed point code.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Template creation for AAC decoder (SBR-module)

Move the existing code to a new template file.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

movtextdec.c: Correct the highlight tags

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

Deprecate avctx.coded_frame

The rationale is that coded_frame was only used to communicate key_frame,
pict_type and quality to the caller, as well as a few other random fields,
in a non predictable, let alone consistent way.

There was agreement that there was no use case for coded_frame, as it is
a full-sized AVFrame container used for just 2-3 int-sized properties,
which shouldn't even belong into the AVCodecContext in the first place.

The appropriate AVPacket flag can be used instead of key_frame, while
quality is exported with the new AVPacketSideData quality factor.
There is no replacement for the other fields as they were unreliable,
mishandled or just not used at all.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Add a quality factor packet side data

This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avcodec/apngdec: Fix typos in decoder causing incorrect results

Signed-off-by: Donny Yang <work@kota.moe>

Gather all coded_frame allocations and free functions to a single place

Allocating coded_frame is what most encoders do anyway, so it makes
sense to always allocate and free it in a single place. Moreover a lot
of encoders freed the frame with av_freep() instead of the correct API
av_frame_free().

This bring uniformity to encoder behaviour and prevents applications
from erroneusly accessing this field when not allocated. Additionally
this helps isolating encoders that export information with coded_frame,
and heavily simplifies its deprecation.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

flashsvenc: Keep coded_frame.key_frame a write-only variable

ffv1enc: Use input frame to set SAR and interlacing

ffv1enc: Keep coded_frame.key_frame a write-only variable

qtrleenc: Keep coded_frame.key_frame a write-only variable

libtheoraenc: Keep coded_frame.key_frame a write-only variable

libvpxenc: Do not entangle coded_frame

Keep coded_frame.key_frame a write-only variable.

libxvid: Do not entangle coded_frame

svq1enc: Do not entangle coded_frame

proresenc: Do not entangle coded_frame

a64multienc: Do not entangle coded_frame

This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.

No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

roqvideoenc: Drop unneeded initialization

Its fields are never initialized to begin with.

mpegvideo_enc: Drop unnneded initialization

coded_frame is already initialized where needed.

avcodec: loongson relocate constants of idctdsp and h264pred

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: loongson constants redefined with macros

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_amerge: increase max number of channels from 32 to 64

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

avfilter/af_astats: use UINT64_C instead of the LLU suffix

Should fix compilation with vs2012

Signed-off-by: James Almer <jamrial@gmail.com>

Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'

* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

parseutil: Add more resolution aliases

Add DCI 2k and 4k and uhd1 and uhd2.

avformat/mp3dec: Rename sync() function to avoid build failure on android

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/avidec: Fix demuxing avi with broken index

Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/ffv1enc: fix assertion failure with unset bits per raw sample

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc/jpeg2000: Signal lossless / bit-exact video stream.

lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.

lavc: Improve documentation for rc_max_rate and bit_rate.

Both may be set by user (libavformat) on decoding.

avcodec/dds: Flip more R<->B cases

Fixes Ticket4665

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dds: fix paletted files

Fixes Ticket4664

The changed fate tests lack red/blue shades and thus look correct
either way

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

RELEASE: update to 2.7.git

Signed-off-by: James Almer <jamrial@gmail.com>

avformat/mp3dec: remove unused variable

Signed-off-by: James Almer <jamrial@gmail.com>

avfilter: add random video filter

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

avdevice/decklink: Add missing libraries when building with DeckLink support on Windows.

Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Add support for Audible AAX (and AAX+) files

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mp3dec: split position sync code out

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Check that channel count is valid in avcodec_open2();

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'

* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
  qsvenc: properly handle asynchronous encoding

Conflicts:
libavcodec/qsvenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'

* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
  qsvdec: properly handle asynchronous decoding

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'

* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
  af_resample: do not touch the timestamps if we are not resampling

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg_filter: Check that filters have connected outputs before accessing the output stream

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'

* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>