Michael Niedermayer ca0e6fa731 Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181' ...

* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

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

2014-03-17 15:58:02 +01:00

10 KiB

Raw Blame History

View Raw