diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:17:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:17:34 +0200 |
| commit | 179527f34ea01a2a9b936acde1cb562780db98a6 (patch) | |
| tree | 3cc418475bd0b330664914aeb7696f7689335998 /libavcodec/mpegvideo.h | |
| 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.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8bf189114d..5f688159e6 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -902,7 +902,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64], int motion_x, int motion_y); -int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src); +int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src); void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture); void ff_free_picture_tables(Picture *pic); |