diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:00:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:05:15 +0100 |
| commit | 0aa208837e247d0e031755e031202e567c5e82fb (patch) | |
| tree | c3b8d2c3efa8525e55bdcb28d2731476abfd4720 /libavcodec/vc1_pred.c | |
| parent | 1f3d4788983d929d76e1d168bec7db1c80a50be5 (diff) | |
| parent | bc75b64cff37d58f3944e2da3da45c37f35f019a (diff) | |
| download | ffmpeg-0aa208837e247d0e031755e031202e567c5e82fb.tar.gz | |
Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'
* commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a':
vc1pred: remove logically dead code
Conflicts:
libavcodec/vc1_pred.c
See: fca435fee167da981f024e35d9fef4e6179b8061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1_pred.c')
| -rw-r--r-- | libavcodec/vc1_pred.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index cf1dce6c6e..d0908ef6be 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -648,7 +648,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, av_assert1(c_valid); px = C[0]; py = C[1]; - } /*else px = py = 0;*/ + } } else { if (field_a && a_valid) { px = A[0]; @@ -657,10 +657,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, av_assert1(field_b && b_valid); px = B[0]; py = B[1]; - } /*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]); |