diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:25:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:39:47 +0200 |
| commit | f275f9eaee9c69bcbc732002f0ee36f480eebb85 (patch) | |
| tree | 8262a8aee25ee9ff50bc036381c542f474bb0ba3 /libavcodec/mpegvideo.h | |
| parent | 179527f34ea01a2a9b936acde1cb562780db98a6 (diff) | |
| parent | 4e17946f10d39eec6cc03fb249ae8147373141b6 (diff) | |
| download | ffmpeg-streaming-f275f9eaee9c69bcbc732002f0ee36f480eebb85.zip ffmpeg-streaming-f275f9eaee9c69bcbc732002f0ee36f480eebb85.tar.gz | |
Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
mpegvideo: Rework various functions not to use MpegEncContext directly
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 5f68815..9c366bb 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -780,7 +780,8 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type); void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); -int ff_find_unused_picture(MpegEncContext *s, int shared); + +int ff_find_unused_picture(AVCodecContext *avctx, Picture *picture, int shared); int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src); int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); void ff_set_qscale(MpegEncContext * s, int qscale); |
