network: Use ff_neterrno instead of AVERROR(errno) for poll errors

[ffmpeg] / libavcodec / vc1_pred.c

diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c
index 6a54fe462a3eef5eb43e9c90a29a93db37fcab62..25be78778abaa70df226b30bf9767cc57f3dddfb 100644 (file)
--- a/libavcodec/vc1_pred.c
+++ b/libavcodec/vc1_pred.c
@@ -468,9 +468,9 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
     MpegEncContext *s = &v->s;
     int xy, wrap, off = 0;
     int A[2], B[2], C[2];
-    int px, py;
+    int px = 0, py = 0;
     int a_valid = 0, b_valid = 0, c_valid = 0;
-    int field_a, field_b, field_c; // 0: same, 1: opposit
+    int field_a, field_b, field_c; // 0: same, 1: opposite
     int total_valid, num_samefield, num_oppfield;
     int pos_c, pos_b, n_adj;
 
@@ -605,8 +605,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
                 if (a_valid) { px = A[0]; py = A[1]; }
                 if (b_valid) { px = B[0]; py = B[1]; }
                 if (c_valid) { px = C[0]; py = C[1]; }
-            } else
-                px = py = 0;
+            }
         }
     } else {
         if (a_valid)
@@ -648,7 +647,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,17 +655,12 @@ 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]);
             py = (a_valid) ? A[1] : ((b_valid) ? B[1] : C[1]);
-        } else
-            px = py = 0;
+        }
     }
 
     /* store MV using signed modulus of MV range defined in 4.11 */