-
Michael Niedermayer authored
* commit '6612a03d': fraps: set color_range Conflicts: libavcodec/fraps.c See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>
ca0e6fa7
* commit '6612a03d': fraps: set color_range Conflicts: libavcodec/fraps.c See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>