eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 02:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/ffv1enc: Fix assertion failure with non zero bits per sample

Browse Source 
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

(cherry picked from commit c1bfeda5a3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-08-06 01:53:30 +02:00
parent 2a8441e949
commit e7c00a2814
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1enc.c
View File

@@ -780,13 +780,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
s->colorspace = 1; s->colorspace = 1;
s->transparency = 1; s->transparency = 1;
s->chroma_planes = 1; s->chroma_planes = 1;
if (!avctx->bits_per_raw_sample)
s->bits_per_raw_sample = 8; s->bits_per_raw_sample = 8;
break; break;
case AV_PIX_FMT_0RGB32: case AV_PIX_FMT_0RGB32:
s->colorspace = 1; s->colorspace = 1;
s->chroma_planes = 1; s->chroma_planes = 1;
if (!avctx->bits_per_raw_sample)
s->bits_per_raw_sample = 8; s->bits_per_raw_sample = 8;
break; break;
case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRP9: