Merge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'

* commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2':
  dv: Mark internal frame reference as const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/dv.h
Simple merge

diff --cc libavcodec/dvdec.c
index 679075e6a98d568c24ddee561074eae8245e9bd3,463d108b2853c0944a4de9f2cbb389c1763b8a11..b75bcb9a1f5eab3e7eb0ac00c0e8dd4623430577
--- 1/libavcodec/dvdec.c
--- 2/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@@ -538,16 -389,13 +539,16 @@@ static int dvvideo_decode_frame(AVCodec
          ff_set_sar(avctx, s->sys->sar[is16_9]);
      }
  
-     if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)
 -    if (ff_get_buffer(avctx, frame, 0) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 -        return -1;
 -    }
++    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
 +        return ret;
-     s->frame->interlaced_frame = 1;
-     s->frame->top_field_first  = 0;
+     frame->interlaced_frame = 1;
+     frame->top_field_first  = 0;
  
-         s->frame->top_field_first = !(vsc_pack[3] & 0x40);
 +    /* Determine the codec's field order from the packet */
 +    if ( *vsc_pack == dv_video_control ) {
++        frame->top_field_first = !(vsc_pack[3] & 0x40);
 +    }
 +
      s->buf = buf;
      avctx->execute(avctx, dv_decode_video_segment, s->work_chunks, NULL,
                     dv_work_pool_size(s->sys), sizeof(DVwork_chunk));