diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 01:01:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 01:01:16 +0200 |
| commit | cf52e6d012d035b82080e6cc045378f900627870 (patch) | |
| tree | 5980a79c186e8b78b20e03819d44a152c01f2c96 | |
| parent | 204b228a1d884343dbd974e6326a06901736b3b4 (diff) | |
| download | ffmpeg-cf52e6d012d035b82080e6cc045378f900627870.tar.gz | |
avcodec/ffv1dec: Fix skip_alpha
Fixes Ticket4322
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ffv1dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d3927a25b7..cc7c605c6b 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -645,6 +645,8 @@ static int read_header(FFV1Context *f) chroma_h_shift = get_symbol(c, state, 0); chroma_v_shift = get_symbol(c, state, 0); transparency = get_rac(c, state); + if (colorspace == 0 && f->avctx->skip_alpha) + transparency = 0; if (f->plane_count) { if (colorspace != f->colorspace || @@ -675,7 +677,6 @@ static int read_header(FFV1Context *f) } if (f->colorspace == 0) { - if (f->avctx->skip_alpha) f->transparency = 0; if (!f->transparency && !f->chroma_planes) { if (f->avctx->bits_per_raw_sample <= 8) f->avctx->pix_fmt = AV_PIX_FMT_GRAY8; |