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

* commit '26e8fa3b':
  tiny_psnr: Use the correct abs() version
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c9943f00':
  vf_framepack: Use av_image_copy() where appropriate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e94e651c':
  dnxhddec: Enable frame threading

FFmpeg has much more threading modes for DNxHD
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c49cbecb':
  dnxhddec: Decode and use interlace mb flag
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c5e5e630':
  riff: Add support for RV40 codec in AVI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b5e4f393':
  avconv: Make the private options discovery more manifest
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3973f0f7':
  Revert "avconv_opt: Allow printing private options"
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cf7d2f2d':
  lavc: Simplify checking quant bias option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '84dfc426':
  avresample: Remove an unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4885bde3':
  motion_est_template: Fix undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '977f41e2':
  mlpdec: Fix a undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '948f3c19':
  lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This fixes -Wshift-negative-value reported with clang 3.7+, e.g
http://fate.ffmpeg.org/log.cgi?time=20150919172459&log=compile&slot=x86_64-darwin-clang-polly-notiling-3.7.
Note that the patch crucially depends on int >= 32 bits,
an assumption made in many places in the codebase.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd00bb8ad':
  mips: intreadwrite: Only execute that code for mips r1 or r2

Not merged, as FFmpeg has a separate condition to protect this code.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1016a75c':
  configure: mips: Support mips r6, r2 and r1

Not merge, as MIPS support in ffmpeg is handled
quite differently and I do not have an env to test.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

This bit is 1 in some samples, and seems to coincide with interlaced
mbs and CID1260. 2008 specs do not know about it, and maintain qscale
is 11 bits. This looks oversized, but may help larger bitdepths.

Currently, it leads to an obviously incorrect qscale value, meaning
its syntax is shifted by 1. However, reading 11 bits also leads to
obviously incorrect decoding: qscale seems to be 10 bits.

However, as most profiles still have 11bits qscale, the feature is
restricted to the CID1260 profile (this flag is dependent on
a higher-level flag located in the header).

The encoder writes 12 bits of syntax, last and first bits always 0,
which is now somewhat inconsistent with the decoder, but ends up with
the same effect (progressive + reserved bit).
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

This reverts commit 7bb1c1bf.
A long existing version in the form of avconv -h decoder=h264 already
existed, and this just duplicates it.

This fixes a -Wunused-variable warning.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

This fixes a -Wshift-negative-value warning reported with clang 3.7+.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

This fixes a -Wshift-negative-value warning reported with clang 3.7+.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Note that convergence_duration had another meaning, one which was in
practice never used. The only real use for it was a 64 bit replacement
for the duration field. It's better just to make duration 64 bits, and
to get rid of it.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

* commit '678f788f':
  configure: Set the initial ldflags to match the cflags
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1a4c5fe5':
  libopenh264enc: Use av_log() to log messages
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8aecec84':
  qsvdec: make ff_qsv_decode_init() static
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '539e5ac2':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3ee462dc':
  examples/qsvdec: do not free the surfaces in the frame_free() callback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2c32eace':
  qsvdec: close the MFX decoder on uninit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd0c8c380':
  qsv: document AVQSVContext members
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5d2daebf':
  qsvenc: mark the encoders as INIT_CLEANUP
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '83847cc8':
  qsvenc: do not try to close the encoder if the session is NULL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '741b352b':
  qsvdec: list supported pixel formats
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ae25413d':
  lavfi: do not exclude hwaccel formats from ff_all_formats()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cc285521':
  checkasm/x86: Correctly handle variadic functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>