diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:30:05 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:49:26 +0300 |
commit | 3244a176505b04f62f7bbb1ac7fb413399a6790c (patch) | |
tree | 8672ecd937aa9be55ab1fc394697751259021419 /libavcodec/mpegvideo.h | |
parent | b18eac7ff22332c9344769af15f7b245dd13cc64 (diff) | |
parent | 9bb11be0e5a75782c3139ad058c2b571499aa37d (diff) |
Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'
* commit '9bb11be0e5a75782c3139ad058c2b571499aa37d':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index cc6f0f44c5..865951647d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -748,7 +748,11 @@ void ff_mpv_motion(MpegEncContext *s, * Allocate a Picture. * The pixels are allocated/set by calling get_buffer() if shared = 0. */ -int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); +int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, + ScratchpadContext *sc, int shared, int encoding, + int chroma_x_shift, int chroma_y_shift, int out_format, + int mb_stride, int mb_width, int mb_height, int b8_stride, + ptrdiff_t *linesize, ptrdiff_t *uvlinesize); int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, ScratchpadContext *sc, int linesize); |