diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:11:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 04:11:21 +0200 |
| commit | f6c524a9399f854602975c7c83c377fc7a4c0d5e (patch) | |
| tree | c8b06c11db7fd2cdac568a884e8d3ada13a50959 /libavcodec/vaapi_mpeg4.c | |
| parent | 78f50e7eb69437fd108c82f963e7add5e9faa36e (diff) | |
| parent | 0c69164f451cc9ca6ce9d6e7568083e2776bc845 (diff) | |
| download | ffmpeg-f6c524a9399f854602975c7c83c377fc7a4c0d5e.tar.gz | |
Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
h263: Convert function to macro
Conflicts:
libavcodec/h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg4.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 4825532821..9b283f7865 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -90,7 +90,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vop_fcode_forward = s->f_code; pic_param->vop_fcode_backward = s->b_code; pic_param->vop_time_increment_resolution = avctx->framerate.num; - pic_param->num_macroblocks_in_gob = s->mb_width * ff_h263_get_gob_height(s); + pic_param->num_macroblocks_in_gob = s->mb_width * H263_GOB_HEIGHT(s->height); pic_param->num_gobs_in_vop = (s->mb_width * s->mb_height) / pic_param->num_macroblocks_in_gob; pic_param->TRB = s->pb_time; pic_param->TRD = s->pp_time; |