ffmpeg | branch: release/2.6 | Michael Niedermayer <michae...@gmx.at> | Thu Mar 19 23:33:36 2015 +0100| [c3be71001cddc7c161c6fa27db16f591918ae3e4] | committer: Michael Niedermayer
avcodec/dnxhddec: Reset is_444 if format is not 444 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit d3bd943108d321b387f955f3ab1ece4e9977401f) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3be71001cddc7c161c6fa27db16f591918ae3e4 --- libavcodec/dnxhddec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 2de2566..2b0e2de 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -157,11 +157,13 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, } else { ctx->decode_dct_block = dnxhd_decode_dct_block_10; ctx->pix_fmt = AV_PIX_FMT_YUV422P10; + ctx->is_444 = 0; } } else if (buf[0x21] == 0x38) { /* 8 bit */ ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 8; ctx->pix_fmt = AV_PIX_FMT_YUV422P; + ctx->is_444 = 0; ctx->decode_dct_block = dnxhd_decode_dct_block_8; } else { av_log(ctx->avctx, AV_LOG_ERROR, "invalid bit depth value (%d).\n", _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
