[FFmpeg-cvslog] Merge commit '39975acc699c83af0a87a7318c0f41e189142938'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 28 12:39:55 2014 +0200| [823ea19a74ef69a71ca4d228c1664f60c4249b50] | committer: Michael Niedermayer

Merge commit '39975acc699c83af0a87a7318c0f41e189142938'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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