virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

svq1 mv array size fix

Browse Source 
Originally committed as revision 3361 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2004-07-28 10:13:45 +00:00
parent 15c8dbe778
commit 7a04636485
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/svq1.c
View File

@ -1108,8 +1108,8 @@ static void svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plan
s->m.me_method= s->avctx->me_method; s->m.me_method= s->avctx->me_method;
if(!s->motion_val8[plane]){ if(!s->motion_val8[plane]){
s->motion_val8 [plane]= av_mallocz(s->m.b8_stride*block_height*2*2*sizeof(int16_t)); s->motion_val8 [plane]= av_mallocz((s->m.b8_stride*block_height*2 + 2)*2*sizeof(int16_t));
s->motion_val16[plane]= av_mallocz(s->m.mb_stride*block_height*2*sizeof(int16_t)); s->motion_val16[plane]= av_mallocz((s->m.mb_stride*(block_height + 2) + 1)*2*sizeof(int16_t));
} }
s->m.mb_type= s->mb_type; s->m.mb_type= s->mb_type;
@ -1120,8 +1120,8 @@ static void svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plan
s->m.current_picture.mc_mb_var= (uint16_t*)s->dummy; s->m.current_picture.mc_mb_var= (uint16_t*)s->dummy;
s->m.current_picture.mb_type= s->dummy; s->m.current_picture.mb_type= s->dummy;
s->m.current_picture.motion_val[0]= s->motion_val8[plane]; s->m.current_picture.motion_val[0]= s->motion_val8[plane] + 2;
s->m.p_mv_table= s->motion_val16[plane]; s->m.p_mv_table= s->motion_val16[plane] + s->m.mb_stride + 1;
s->m.dsp= s->dsp; //move s->m.dsp= s->dsp; //move
ff_init_me(&s->m); ff_init_me(&s->m);

8
tests/ffmpeg.regression.ref
View File

@ -107,10 +107,10 @@ stddev: 8.08 PSNR:29.97 bytes:7602176
2653690 ./data/a-ffv1.avi 2653690 ./data/a-ffv1.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
9ebbef45611d99d4134c1dac04c88378 *./data/a-svq1.mov c672f70e2176a897b1ba816749574751 *./data/a-svq1.mov
1384015 ./data/a-svq1.mov 1384019 ./data/a-svq1.mov
f14dcf0f15be154c1384086c3d0e8a13 *./data/out.yuv ccc201054669e94717022bb4f2aea4ce *./data/out.yuv
stddev: 10.98 PSNR:27.30 bytes:7602176 stddev: 10.99 PSNR:27.30 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
95712 ./data/a-mp2.mp2 95712 ./data/a-mp2.mp2
624d9789f3ac193bbae4af3bd8cb02b7 *./data/out.wav 624d9789f3ac193bbae4af3bd8cb02b7 *./data/out.wav