diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 23:28:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:34:23 +0200 |
| commit | 760c384f7db44e7d7ecc01a834fd57c33fca360d (patch) | |
| tree | c7f0e25de53e18a67254c5571938b5df1c75f0e0 | |
| parent | 17e6d249b702b8b6aa3452c3deef5e2042fc0f23 (diff) | |
| download | ffmpeg-760c384f7db44e7d7ecc01a834fd57c33fca360d.tar.gz | |
avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
Fixes Ticket4227
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2c660e34cf3c2b77cd2bef6f292920334dfd9192)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dnxhddec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 06800746d1..a8cf0800aa 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -363,7 +363,7 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, dest_u = frame->data[1] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1 + ctx->is_444)); dest_v = frame->data[2] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1 + ctx->is_444)); - if (ctx->cur_field) { + if (frame->interlaced_frame && ctx->cur_field) { dest_y += frame->linesize[0]; dest_u += frame->linesize[1]; dest_v += frame->linesize[2]; |