diff options
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index b72a67d01c..03249d6fa3 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -612,7 +612,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, uint8_t *buf = avpkt->data; int buf_size = avpkt->size; DVVideoContext *s = avctx->priv_data; - ThreadFrame frame = { .f = data }; + AVFrame *const frame = data; const uint8_t *vsc_pack; int apt, is16_9, ret; const AVDVProfile *sys; @@ -633,9 +633,9 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, s->sys = sys; } - s->frame = frame.f; - frame.f->key_frame = 1; - frame.f->pict_type = AV_PICTURE_TYPE_I; + s->frame = frame; + frame->key_frame = 1; + frame->pict_type = AV_PICTURE_TYPE_I; avctx->pix_fmt = s->sys->pix_fmt; avctx->framerate = av_inv_q(s->sys->time_base); @@ -652,20 +652,20 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, ff_set_sar(avctx, s->sys->sar[is16_9]); } - if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, frame, 0)) < 0) return ret; /* Determine the codec's field order from the packet */ if ( *vsc_pack == dv_video_control ) { if (avctx->height == 720) { - frame.f->interlaced_frame = 0; - frame.f->top_field_first = 0; + frame->interlaced_frame = 0; + frame->top_field_first = 0; } else if (avctx->height == 1080) { - frame.f->interlaced_frame = 1; - frame.f->top_field_first = (vsc_pack[3] & 0x40) == 0x40; + frame->interlaced_frame = 1; + frame->top_field_first = (vsc_pack[3] & 0x40) == 0x40; } else { - frame.f->interlaced_frame = (vsc_pack[3] & 0x10) == 0x10; - frame.f->top_field_first = !(vsc_pack[3] & 0x40); + frame->interlaced_frame = (vsc_pack[3] & 0x10) == 0x10; + frame->top_field_first = !(vsc_pack[3] & 0x40); } } |