[FFmpeg-cvslog] avcodec/h264_slice: Reformat IN_RANGE() uses to be readable

Michael Niedermayer git at videolan.org
Sun Jun 28 00:14:21 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 23:56:41 2015 +0200| [6323647c3550fe1aa3d92ff112de2d2f0d8da267] | committer: Michael Niedermayer

avcodec/h264_slice: Reformat IN_RANGE() uses to be readable

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264_slice.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 69401a2..f755b96 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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);
     }
 }



More information about the ffmpeg-cvslog mailing list