diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 20:38:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 20:38:49 +0200 |
commit | 5d9873ecdab8d07c4f928d604a819756bb540e4b (patch) | |
tree | a18fb5b429e04e5221fbbc21dc891cc6cb819a7a /libavfilter/drawutils.h | |
parent | cb7c4f73e5e3debe2646279eaa7cfb493573118b (diff) | |
parent | d0dce15da34c0e4eee6c683be299de0221db00d3 (diff) | |
download | ffmpeg-5d9873ecdab8d07c4f928d604a819756bb540e4b.tar.gz |
Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'
* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
quickdraw: Make the palette opaque
Conflicts:
libavcodec/qdrw.c
See: 9f9a1f424ed4db992f8a773b2eaad4941de3e9e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/drawutils.h')
0 files changed, 0 insertions, 0 deletions