avcodec/h264_slice: Reformat IN_RANGE() uses to be readable
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 21:56:41 +0000 (23:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 21:56:41 +0000 (23:56 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c

index 69401a2..f755b96 100644 (file)
@@ -397,10 +397,9 @@ static void copy_picture_range(H264Picture **to, H264Picture **from, int count,
     int i;
 
     for (i = 0; i < count; i++) {
-        av_assert1((IN_RANGE(from[i], old_base, 1) ||
-                IN_RANGE(from[i], old_base->DPB,
-                         H264_MAX_PICTURE_COUNT) ||
-                !from[i]));
+        av_assert1(!from[i] ||
+                   IN_RANGE(from[i], old_base, 1) ||
+                   IN_RANGE(from[i], old_base->DPB, H264_MAX_PICTURE_COUNT));
         to[i] = REBASE_PICTURE(from[i], new_base, old_base);
     }
 }