aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-17 03:17:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-17 04:05:14 +0200
commit84cd3729ef246a3fe43837951fc58bf35f0dec39 (patch)
treed0e0e5f3946c5d6194c511c6b64c5ae33f67e3bb
parent052ab208059ccb30e6bb73866995ef1aabf2feb6 (diff)
downloadffmpeg-84cd3729ef246a3fe43837951fc58bf35f0dec39.tar.gz
imgconvert: fix regression with fate-gif colorspaces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/imgconvert.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 76d75aaafe..a8d01f7bdb 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -485,6 +485,7 @@ enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat dst_pix_fmt1, enum
~(FF_LOSS_COLORSPACE | FF_LOSS_RESOLUTION),
~FF_LOSS_COLORQUANT,
~FF_LOSS_DEPTH,
+ ~(FF_LOSS_DEPTH|FF_LOSS_COLORSPACE),
~(FF_LOSS_RESOLUTION | FF_LOSS_DEPTH | FF_LOSS_COLORSPACE | FF_LOSS_ALPHA |
FF_LOSS_COLORQUANT | FF_LOSS_CHROMA),
0x80000, //non zero entry that combines all loss variants including future additions