[FFmpeg-cvslog] vc1pred: remove logically dead code

Vittorio Giovara git at videolan.org
Tue Nov 25 11:17:08 CET 2014


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Nov 24 01:38:53 2014 +0000| [bc75b64cff37d58f3944e2da3da45c37f35f019a] | committer: Vittorio Giovara

vc1pred: remove logically dead code

CC: libav-stable at libav.org
Bug-Id: CID 1245699 / CID 1245700

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc75b64cff37d58f3944e2da3da45c37f35f019a
---

 libavcodec/vc1_pred.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c
index 6a54fe4..07e9d91 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,
                 } else if (c_valid) {
                     px = C[0];
                     py = C[1];
-                } else px = py = 0;
+                }
             } else {
                 if (field_a && a_valid) {
                     px = A[0];
@@ -656,11 +656,7 @@ void ff_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) {
-                    px = C[0];
-                    py = C[1];
-                } else
-                    px = py = 0;
+                }
             }
         } else if (total_valid == 1) {
             px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);



More information about the ffmpeg-cvslog mailing list