diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:54:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:55:18 +0100 |
| commit | 1c79ca272de8a94ef7a7cc4352645a1013cf9be3 (patch) | |
| tree | e4074b6c4df0bc579ef52be714524c21e9c5ce4c /libavcodec/fraps.c | |
| parent | ba7cdb970f1cb49ae7a99948dae6b88d163545fe (diff) | |
| parent | 5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4 (diff) | |
Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'
* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
tiff: Support rgba encoding
Conflicts:
libavcodec/tiffenc.c
See: d7fc100694f776092ce07f616dbe0f02e73f347f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fraps.c')
0 files changed, 0 insertions, 0 deletions