[FFmpeg-cvslog] Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:56:49 2014 +0100| [ca0e6fa7317cbc0677f6e90945a61baef3937915] | committer: Michael Niedermayer

Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

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

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