ffmpeg | branch: release/3.1 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Aug 6 01:53:30 2016 +0200| [54d48c8e901d849908ff09774d19043106f64157] | committer: Michael Niedermayer
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample Fixes Ticket5736 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54d48c8e901d849908ff09774d19043106f64157 --- libavcodec/ffv1enc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 948a230..383956b 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -781,14 +781,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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
