[FFmpeg-cvslog] Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 16:10:17 2014 +0100| [020baa0be64b460d48fecdfe13f1adabf6a293cd] | committer: Michael Niedermayer

Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'

* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

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

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