diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:40:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:40:51 +0100 |
| commit | f09f295109b3d333ecd97f4c200fd543add0e416 (patch) | |
| tree | f341a71dd6581ef5ec27628250c1ebacb45e2055 /libavcodec/vaapi_mpeg4.c | |
| parent | 7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a (diff) | |
| parent | e026ee0446de27fc38e33e98704fada012fdc763 (diff) | |
| download | ffmpeg-f09f295109b3d333ecd97f4c200fd543add0e416.tar.gz | |
Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'
* commit 'e026ee0446de27fc38e33e98704fada012fdc763':
mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg4.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index e47608e7bd..d25ce5e23e 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -75,8 +75,8 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vol_fields.bits.resync_marker_disable = !ctx->resync_marker; pic_param->no_of_sprite_warping_points = ctx->num_sprite_warping_points; for (i = 0; i < ctx->num_sprite_warping_points && i < 3; i++) { - pic_param->sprite_trajectory_du[i] = s->sprite_traj[i][0]; - pic_param->sprite_trajectory_dv[i] = s->sprite_traj[i][1]; + pic_param->sprite_trajectory_du[i] = ctx->sprite_traj[i][0]; + pic_param->sprite_trajectory_dv[i] = ctx->sprite_traj[i][1]; } pic_param->quant_precision = s->quant_precision; pic_param->vop_fields.value = 0; /* reset all bits */ |