[FFmpeg-cvslog] Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 24 12:48:39 2016 +0100| [4fe4c5c3761a92fdaf8b3bbb21c00fb40b08f156] | committer: Derek Buitenhuis

Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'

This merge is a no-op.

* commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e':
  rtpdec_jpeg: fix low contrast image on low quality setting

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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