diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:57:30 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:15:32 +0300 |
| commit | a25ee5f9228d495fb9a69512632686cfa26df32f (patch) | |
| tree | 28406eb4e763cdd0f031d0d49e2574ac61b23214 /libavcodec/mpegvideo.h | |
| parent | bc373595f28e20f69505dd0d29f716935c06f958 (diff) | |
| parent | d528045558825f01472e9bee873f60c98d661e53 (diff) | |
Merge commit 'd528045558825f01472e9bee873f60c98d661e53'
* commit 'd528045558825f01472e9bee873f60c98d661e53':
mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
The memset is left in place
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 0617eee573..8bf189114d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -903,7 +903,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, int motion_x, int motion_y); int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src); -void ff_mpeg_unref_picture(MpegEncContext *s, Picture *picture); +void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture); void ff_free_picture_tables(Picture *pic); |