diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:58:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 01:28:04 +0100 |
| commit | ee9d53e5726250295cfe0b9e67518fdd1475390e (patch) | |
| tree | 49c8d062310d87707522dee0db6efdc3d084fce3 /libavcodec/vdpau_mpeg4.c | |
| parent | 2d2b363c652403ac0bda129912e1910aacdaa3fc (diff) | |
| parent | 48e139409556861c9e561ce34133891d8eecc3cf (diff) | |
| download | ffmpeg-ee9d53e5726250295cfe0b9e67518fdd1475390e.tar.gz | |
Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'
* commit '48e139409556861c9e561ce34133891d8eecc3cf':
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
| -rw-r--r-- | libavcodec/vdpau_mpeg4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 84683a4779..282796eafa 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; |