videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

vc1dec: Disable dead code 

Fixes CID732197/6

A assert is added to check that the disabled code wont
be needed in the future.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-04 02:27:21 +02:00
parent d19d679e4b
commit fca435fee1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/vc1dec.c
View File

@ -1843,21 +1843,23 @@ static inline void vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
} else if (!field_b && b_valid) {
px = B[0];
py = B[1];
} else if (c_valid) {
} else /*if (c_valid)*/ {
av_assert1(c_valid);
px = C[0];
py = C[1];
} else px = py = 0;
} /*else px = py = 0;*/
} else {
if (field_a && a_valid) {
px = A[0];
py = A[1];
} else if (field_b && b_valid) {
} else /*if (field_b && b_valid)*/ {
av_assert1(field_b && b_valid);
px = B[0];
py = B[1];
} else if (c_valid) {
} /*else if (c_valid) {
px = C[0];
py = C[1];
}
}*/
}
} else if (total_valid == 1) {
px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);