aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/tree.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-13 01:44:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-13 01:44:27 +0200
commit69505a89f1edcda4191d62149d801da6f48a6c27 (patch)
treece73485cdc210515b928f60baa63f9029fc54a26 /libavutil/tree.h
parent57570052e244d12900caf6f65bb3dcca12817245 (diff)
parentd9a542ace1b9ca5c0ea6d758127d03d4124b7801 (diff)
downloadffmpeg-69505a89f1edcda4191d62149d801da6f48a6c27.tar.gz
Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801': swscale: Set alpha to opaque for internal palettes. Conflicts: libswscale/swscale_unscaled.c See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/tree.h')
0 files changed, 0 insertions, 0 deletions