* commit '3c525b8b':
  rtpdec: Increase the max size of the jitter buffer to 500 packets
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '570fcaf3':
  jpeg2000: Factor out prec init
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Reported and tested by Andy Furniss, adf d lists at gmail

* commit '95a41311':
  jpeg2000: Factor out band stepsize initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7fb93eae':
  jpeg2000: Factor out band initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1b709f23':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '29b00f88':
  jpeg2000: Templatize the frame writer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

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

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

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

* commit '41bcc3d1':
  jpeg2000: Split codeblock decoding from the main tile decoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '6536da73':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e60a6e75':
  mpegvideo: Drop mpegvideo.h where not needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5d14cf19':
  mpegvideo: Make sure mpegutils.h is included where needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* 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>