summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-19 23:28:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-19 23:28:39 +0100
commit2c660e34cf3c2b77cd2bef6f292920334dfd9192 (patch)
tree95b20eeac55907dcfe7a12b4fcd2e510aee92028 /libavcodec/dnxhddec.c
parentbbcc09518e0d1efc189a43ff0120c1a31f51c802 (diff)
avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
Fixes Ticket4227 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
-rw-r--r--libavcodec/dnxhddec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 433597720f..2de2566d72 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -373,7 +373,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];