diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:51:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:51:35 +0100 |
| commit | 7e90053822f43e5dfc55d6cdac02f993068f4533 (patch) | |
| tree | 43ce8bd9cd7f85a366b6d86be0135605c6090d9f /libavcodec | |
| parent | 1667152a9c1af2ca978f005bb095e479ef7a3107 (diff) | |
| parent | 45635885e44cb7adce35ac19279d48c1ef6c4779 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: increase edge_emu_buffer size for VC1
lavc: merge latest x86inc.asm fixes with x264
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2d0b8a4ba6..5889e1c73a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -238,8 +238,10 @@ int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize) // edge emu needs blocksize + filter length - 1 // (= 17x17 for halfpel / 21x21 for h264) + // VC1 computes luma and chroma simultaneously and needs 19X19 + 9x9 + // at uvlinesize. It supports only YUV420 so 24x24 is enough // linesize * interlaced * MBsize - FF_ALLOCZ_OR_GOTO(s->avctx, s->edge_emu_buffer, alloc_size * 4 * 21, + FF_ALLOCZ_OR_GOTO(s->avctx, s->edge_emu_buffer, alloc_size * 4 * 24, fail); FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, alloc_size * 2 * 16 * 2, |