virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

1000l to myself for FFMIN(...,0) instead of ...,6)

Browse Source 
some more checks

Originally committed as revision 3238 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-06-19 01:25:02 +00:00
parent cceb990ef9
commit cbf5374fc0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/svq3.c
View File

@ -453,9 +453,11 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
mb_type = MB_TYPE_SKIP; mb_type = MB_TYPE_SKIP;
} else { } else {
mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 0); mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6);
svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0); if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0)
svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1); return -1;
if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0)
return -1;
mb_type = MB_TYPE_16x16; mb_type = MB_TYPE_16x16;
} }
@ -513,17 +515,20 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
/* decode motion vector(s) and form prediction(s) */ /* decode motion vector(s) and form prediction(s) */
if (s->pict_type == P_TYPE) { if (s->pict_type == P_TYPE) {
svq3_mc_dir (h, (mb_type - 1), mode, 0, 0); if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0)
return -1;
} else { /* B_TYPE */ } else { /* B_TYPE */
if (mb_type != 2) { if (mb_type != 2) {
svq3_mc_dir (h, 0, mode, 0, 0); if(svq3_mc_dir (h, 0, mode, 0, 0) < 0)
return -1;
} else { } else {
for (i=0; i < 4; i++) { for (i=0; i < 4; i++) {
memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
} }
} }
if (mb_type != 1) { if (mb_type != 1) {
svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)); if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0)
return -1;
} else { } else {
for (i=0; i < 4; i++) { for (i=0; i < 4; i++) {
memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));