diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:17:18 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:17:34 +0300 |
commit | 179527f34ea01a2a9b936acde1cb562780db98a6 (patch) | |
tree | 3cc418475bd0b330664914aeb7696f7689335998 /libavcodec/mpegvideo.c | |
parent | a25ee5f9228d495fb9a69512632686cfa26df32f (diff) | |
parent | a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2 (diff) |
Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 3270ce329f..f8e5ea8789 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -773,7 +773,7 @@ do {\ return 0; } -int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src) +int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src) { int ret; @@ -807,7 +807,7 @@ int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src) return 0; fail: - ff_mpeg_unref_picture(s->avctx, dst); + ff_mpeg_unref_picture(avctx, dst); return ret; } @@ -996,7 +996,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, for (i = 0; i < MAX_PICTURE_COUNT; i++) { ff_mpeg_unref_picture(s->avctx, &s->picture[i]); if (s1->picture[i].f->buf[0] && - (ret = ff_mpeg_ref_picture(s, &s->picture[i], &s1->picture[i])) < 0) + (ret = ff_mpeg_ref_picture(s->avctx, &s->picture[i], &s1->picture[i])) < 0) return ret; } @@ -1004,7 +1004,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, do {\ ff_mpeg_unref_picture(s->avctx, &s->pic);\ if (s1->pic.f && s1->pic.f->buf[0])\ - ret = ff_mpeg_ref_picture(s, &s->pic, &s1->pic);\ + ret = ff_mpeg_ref_picture(s->avctx, &s->pic, &s1->pic);\ else\ ret = update_picture_tables(&s->pic, &s1->pic);\ if (ret < 0)\ @@ -1838,7 +1838,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) // s->current_picture_ptr->quality = s->new_picture_ptr->quality; s->current_picture_ptr->f->key_frame = s->pict_type == AV_PICTURE_TYPE_I; - if ((ret = ff_mpeg_ref_picture(s, &s->current_picture, + if ((ret = ff_mpeg_ref_picture(s->avctx, &s->current_picture, s->current_picture_ptr)) < 0) return ret; @@ -1938,14 +1938,14 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (s->last_picture_ptr) { ff_mpeg_unref_picture(s->avctx, &s->last_picture); if (s->last_picture_ptr->f->buf[0] && - (ret = ff_mpeg_ref_picture(s, &s->last_picture, + (ret = ff_mpeg_ref_picture(s->avctx, &s->last_picture, s->last_picture_ptr)) < 0) return ret; } if (s->next_picture_ptr) { ff_mpeg_unref_picture(s->avctx, &s->next_picture); if (s->next_picture_ptr->f->buf[0] && - (ret = ff_mpeg_ref_picture(s, &s->next_picture, + (ret = ff_mpeg_ref_picture(s->avctx, &s->next_picture, s->next_picture_ptr)) < 0) return ret; } |