Merge commit '39975acc699c83af0a87a7318c0f41e189142938'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jun 2014 10:39:55 +0000 (12:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jun 2014 10:40:01 +0000 (12:40 +0200)
commit823ea19a74ef69a71ca4d228c1664f60c4249b50
tree11595929052a00f3435d7ebfc845d572d0e7c951
parente925a82e2478adfbfb17813729ed8e68cf9c7120
parent39975acc699c83af0a87a7318c0f41e189142938
Merge commit '39975acc699c83af0a87a7318c0f41e189142938'

* commit '39975acc699c83af0a87a7318c0f41e189142938':
  rtpenc_jpeg: check for color_range too

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpenc_jpeg.c