OSDN Git Service

avcodec/h264_refs: split conditions of if() up for better readability
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_refs.c

index 8f86db6..17799a8 100644 (file)
@@ -745,7 +745,11 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
     print_short_term(h);
     print_long_term(h);
 
-    if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){
+    if (   err >= 0
+        && h->long_ref_count==0
+        && h->short_ref_count<=2
+        && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME)
+        && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){
         h->cur_pic_ptr->recovered |= 1;
         if(!h->avctx->has_b_frames)
             h->frame_recovered |= FRAME_RECOVERED_SEI;