[FFmpeg-cvslog] Merge commit '5049f6b772891cdf4030a9d572362efc8f7ae97f'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Jan  2 13:19:23 2016 +0100| [8a04ddeb4704e1f3c7237d48d95edae08a3193fe] | committer: Hendrik Leppkes

Merge commit '5049f6b772891cdf4030a9d572362efc8f7ae97f'

* commit '5049f6b772891cdf4030a9d572362efc8f7ae97f':
  rtpdec_jpeg: Coalesce redundant error checks

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a04ddeb4704e1f3c7237d48d95edae08a3193fe
---