[FFmpeg-cvslog] avcodec/h264_refs: split conditions of if() up for better readability

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  2 02:12:39 2013 +0100| [1141a18e89d2e6ed4b0a9631ba9ffd57214071e1] | committer: Carl Eugen Hoyos

avcodec/h264_refs: split conditions of if() up for better readability

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ab6ea7a81921a168575be63b3d9049ca716e707a)

Conflicts:
	libavcodec/h264_refs.c

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

 libavcodec/h264_refs.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 27ca8f8..f6b0c93 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -732,7 +732,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->sync |= 1;
         if(!h->avctx->has_b_frames)
             h->sync = 2;