[SCM] libav/experimental: Re-indent after PAFF MMCO implementation patch.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:07:57 UTC 2013


The following commit has been merged in the experimental branch:
commit 5a421d538e4ccddf107c8928b690f2d6003293bd
Author: Jeff Downs <heydowns at borg.com>
Date:   Sun Oct 7 23:46:51 2007 +0000

    Re-indent after PAFF MMCO implementation patch.
    
    patch by Jeff Downs, heydowns a borg d com
    original thread:
    Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
    Date: 18/09/07 20:30
    
    Originally committed as revision 10679 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d972032..56048d9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3493,10 +3493,10 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
                 if(pic) unreference_pic(h, pic, 0);
 
                 h->long_ref[ mmco[i].long_arg ]= remove_short(h, frame_num);
-            if (h->long_ref[ mmco[i].long_arg ]){
-                h->long_ref[ mmco[i].long_arg ]->long_ref=1;
-                h->long_ref_count++;
-            }
+                if (h->long_ref[ mmco[i].long_arg ]){
+                    h->long_ref[ mmco[i].long_arg ]->long_ref=1;
+                    h->long_ref_count++;
+                }
             }
             break;
         case MMCO_LONG2UNUSED:
@@ -3530,12 +3530,12 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
             }
 
             if (unref_pic) {
-            pic= remove_long(h, mmco[i].long_arg);
-            if(pic) unreference_pic(h, pic, 0);
+                pic= remove_long(h, mmco[i].long_arg);
+                if(pic) unreference_pic(h, pic, 0);
 
-            h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
-            h->long_ref[ mmco[i].long_arg ]->long_ref=1;
-            h->long_ref_count++;
+                h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
+                h->long_ref[ mmco[i].long_arg ]->long_ref=1;
+                h->long_ref_count++;
             }
 
             s->current_picture_ptr->reference |= s->picture_structure;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list