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>

avcodec/apngdec: Fix typos in decoder causing incorrect results

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

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>

avfilter: Add reverse filter

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

Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'

* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
  avconv: create the complex filtergraphs earlier

Conflicts:
ffmpeg_opt.c

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

Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'

* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
  avconv: move the no streams failure to open_output_file()

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

Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'

* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
  avconv: factor out the output stream initialization

Conflicts:
ffmpeg.c

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

Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'

* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c

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

Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'

* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
ffmpeg.c

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

Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'

* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
ffmpeg.c

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

ffmpeg_opt: Fix stream copy flag for attachments

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

Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'

* commit '56c2f37727015212a404cae0f444d8bc8704d691':
  avconv: drop update_sample_fmt()

Conflicts:
ffmpeg.c

No change as the removed code is not in FFmpeg

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

Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'

* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
  asfdec: make nb_sub to be unsigned int

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

Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'

* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
  asfdec: read the replicated data in a separate function

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

Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'

* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
  asfdec: convert condition for the replicated data reading to be safer

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

Merge commit '406627287e015ce381795e85e2557b12bf60ca35'

* commit '406627287e015ce381795e85e2557b12bf60ca35':
  asfdec: do not read replicated data when their length is 0

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

qsvenc: properly handle asynchronous encoding

Wait for async_depth frames before syncing.

qsvdec: properly handle asynchronous decoding

Wait for async_depth frames before syncing.

af_resample: do not touch the timestamps if we are not resampling

This filter currently assumes that the input audio is continuous and
does some timestamps manipulation based on this assumption.

This is unnecessary if we are only converting the channel layout or the
sample format, without resampling. In such a case, just leave the
timestamps as they are.

avconv: split creating and (re-)configuring complex filtergraphs

The current code is less than straightforward due to the fact that
output streams can be created based on filtergraph definitions. This
change should make the code simpler and more readable. It will also be
useful in the future commits.

avconv: create the complex filtergraphs earlier

Since global options are processed before all the other options now, we
do not have to try creating the complex filtergraphs several times
anymore, it is enough to do it once after the input files are opened.

avconv: move the no streams failure to open_output_file()

It is a better place for it, there is no reason to wait until
transcode_init().

avconv: factor out the output stream initialization

avconv: use read_file() for reading the 2pass stats

Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.

avconv: move handling the 2pass logfile into avconv_opt

It more logically belongs there.

avconv: set the encoding/decoding_needed flags earlier

This will be useful in the following commits.

avconv: drop update_sample_fmt()

There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one) and this code goes against
the avconv design, since it propagates information back from the encoder
to decoder.

asfdec: make nb_sub to be unsigned int

number of subpayloads should be always positive

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

asfdec: read the replicated data in a separate function

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

asfdec: convert condition for the replicated data reading to be safer

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

asfdec: do not read replicated data when their length is 0

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

avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU

Fixes ticket4718

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

avutil/x86/bswap: force inline asm versions with ICC

Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.

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

avutil/intmath: check for ICC before GCC

Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.

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

avfilter/vf_blend: unbreak tblend

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

fate: add tblend filter test

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

avformat/mpegtsenc: Add sdt_period, similar to pat_period

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

avformat/mpegtsenc: Support a user specified PAT/PMT period

Can be used to fix Ticket3714

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

avformat/mpegtsenc: support storing PAT/PMT per frame

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

doc/developer: add url for sample files

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_blend: implement 16bit support

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

fate: add test for mergeplanes filter

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

avcodec/vp8: Check buffer size in vp8_decode_frame_header()

avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()

Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/diracdec: Check for hpel_base allocation failure

Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/movenc: Drop redundant bit exact field from context

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