Merge commit '5049f6b772891cdf4030a9d572362efc8f7ae97f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:19:23 +0000 (13:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:19:23 +0000 (13:19 +0100)
commit8a04ddeb4704e1f3c7237d48d95edae08a3193fe
tree7ed131814c8e58162eb7cf644552b02cf134daae
parentd03da3e24020e9ef7b7558c0f1741331d46c2c21
parent5049f6b772891cdf4030a9d572362efc8f7ae97f
Merge commit '5049f6b772891cdf4030a9d572362efc8f7ae97f'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/rtpdec_jpeg.c