summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau_mpeg4.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-26 12:18:44 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-29 14:19:47 +0100
commit48e139409556861c9e561ce34133891d8eecc3cf (patch)
treef6ac4af6aa5b17856d4e78713a0d2c4f3b27286e /libavcodec/vdpau_mpeg4.c
parentc2f7417eeb9cc31f75e71f7be2780f90f1628d7e (diff)
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
-rw-r--r--libavcodec/vdpau_mpeg4.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 8ccb3d6d6a..17205fe317 100644
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -24,13 +24,15 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
+#include "mpeg4video.h"
#include "vdpau.h"
#include "vdpau_internal.h"
static int vdpau_mpeg4_start_frame(AVCodecContext *avctx,
const uint8_t *buffer, uint32_t size)
{
- MpegEncContext * const s = avctx->priv_data;
+ Mpeg4DecContext *ctx = avctx->priv_data;
+ MpegEncContext * const s = &ctx->m;
Picture *pic = s->current_picture_ptr;
struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
VdpPictureInfoMPEG4Part2 *info = &pic_ctx->info.mpeg4;
@@ -62,7 +64,7 @@ static int vdpau_mpeg4_start_frame(AVCodecContext *avctx,
info->vop_time_increment_resolution = s->avctx->time_base.den;
info->vop_fcode_forward = s->f_code;
info->vop_fcode_backward = s->b_code;
- info->resync_marker_disable = !s->resync_marker;
+ info->resync_marker_disable = !ctx->resync_marker;
info->interlaced = !s->progressive_sequence;
info->quant_type = s->mpeg_quant;
info->quarter_sample = s->quarter_sample;