diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-06 01:53:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | e7c00a2814238d199e2ae83eb98f97f4fd8fce7a (patch) | |
| tree | f562563e5969339abf3e2ce696b357bfcdf3a2da | |
| parent | 2a8441e949ee2eb83e78673b5fd877045c9b53be (diff) | |
| download | android_external_ffmpeg-e7c00a2814238d199e2ae83eb98f97f4fd8fce7a.tar.gz android_external_ffmpeg-e7c00a2814238d199e2ae83eb98f97f4fd8fce7a.tar.bz2 android_external_ffmpeg-e7c00a2814238d199e2ae83eb98f97f4fd8fce7a.zip | |
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 9ee992144b..42e59a1efc 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -780,14 +780,12 @@ FF_ENABLE_DEPRECATION_WARNINGS s->colorspace = 1; s->transparency = 1; s->chroma_planes = 1; - if (!avctx->bits_per_raw_sample) - s->bits_per_raw_sample = 8; + s->bits_per_raw_sample = 8; break; case AV_PIX_FMT_0RGB32: s->colorspace = 1; s->chroma_planes = 1; - if (!avctx->bits_per_raw_sample) - s->bits_per_raw_sample = 8; + s->bits_per_raw_sample = 8; break; case AV_PIX_FMT_GBRP9: if (!avctx->bits_per_raw_sample) |