diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:16:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:16:36 +0200 |
| commit | e05fda99f7a4e1e80479b4e9b4a92e33dd0c06be (patch) | |
| tree | a19ac75cb8ff278c7fc69d2dfffdb29b796f62d1 /libavcodec/mpegvideo.h | |
| parent | db8ae37a783aba18d8f869dae1824a3e3f984bf8 (diff) | |
| parent | f8716a1408f4f4ec63857b7015fbd62f9eac344a (diff) | |
| download | ffmpeg-e05fda99f7a4e1e80479b4e9b4a92e33dd0c06be.tar.gz | |
Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
* commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a':
mpegvideo: Rework frame_size_alloc function
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, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9f15e91861..cc6f0f44c5 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -750,6 +750,8 @@ void ff_mpv_motion(MpegEncContext *s, */ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); +int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, + ScratchpadContext *sc, int linesize); /** * permute block according to permuatation. * @param last last non zero element in scantable order |