* commit '525f5897':
  mpegvideo: Move macros to more appropriate headers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '285fe5b0':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c7247eb7':
  lavr: Remove unreachable code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'dc54c78c':
  buffersrc: Improve initialization log message
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2c6014c6':
  fate: Change global error option to private error_rate option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e17db9ac':
  fate: Move mv0 option from global to mpv private
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5b142a4d':
  lavc: Keep idct integer option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '18adc1fd':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '10de4087':
  lavf: Update to the new crypto API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

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

avformat/flvdec: Change packet loop to return EAGAIN instead of looping until a valid packet is foud
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

op== is confusing, as it may easily be mistook for an equality check,
while in reality it is doing an assigment to '='.
This patch has the additional benefit of cleaning up 2 warnings from shellcheck.net.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

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

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

Fixes ticket #2089.

avcodec/ffv1enc: Fix error message when the requested version does not support the requested features
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

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

Both are only accessible through AVOptions.

Based on a patch by Steve Swanson, swanysteve at gmail.

Fixes ticket #2089.

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

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

This fixes cases where the shifted number is 64, but we shifted non-
zero numbers away in the shift. The change makes behaviour consistent
with libvpx.

This commit adds an error trace when jitter buffer
is full. It helps to understand leading decoding issues.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This commit print as AV_LOG_INFO the jitter buffer
size. It might be the default value or the value set by application.
Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

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

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

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

The function is automatically called.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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