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_enc.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_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6c8559fd54..4320ce3cbc 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1520,7 +1520,7 @@ no_output_pic: AV_PICTURE_TYPE_B ? 3 : 0; ff_mpeg_unref_picture(s->avctx, &s->new_picture); - if ((ret = ff_mpeg_ref_picture(s, &s->new_picture, s->reordered_input_picture[0]))) + if ((ret = ff_mpeg_ref_picture(s->avctx, &s->new_picture, s->reordered_input_picture[0]))) return ret; if (s->reordered_input_picture[0]->shared || s->avctx->rc_buffer_size) { @@ -1555,7 +1555,7 @@ no_output_pic: } } ff_mpeg_unref_picture(s->avctx, &s->current_picture); - 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; @@ -1642,7 +1642,7 @@ static int frame_start(MpegEncContext *s) s->current_picture_ptr->f->key_frame = s->pict_type == AV_PICTURE_TYPE_I; ff_mpeg_unref_picture(s->avctx, &s->current_picture); - 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; @@ -1655,14 +1655,14 @@ static int frame_start(MpegEncContext *s) 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; } |