diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:56:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:58:02 +0100 |
| commit | ca0e6fa7317cbc0677f6e90945a61baef3937915 (patch) | |
| tree | cce55a4bc9cd225afd686d7a00a191e60f18c0fa /libavformat/libssh.c | |
| parent | 1c79ca272de8a94ef7a7cc4352645a1013cf9be3 (diff) | |
| parent | 6612a03d7470af4aa6b8aa313b1eff013691d181 (diff) | |
| download | ffmpeg-ca0e6fa7317cbc0677f6e90945a61baef3937915.tar.gz | |
Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'
* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
fraps: set color_range
Conflicts:
libavcodec/fraps.c
See: 79f452f4e68696f1daa9f205b35037185959c9ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libssh.c')
0 files changed, 0 insertions, 0 deletions