[SCM] libav/experimental: Reindent after last commit on dxva2 h264 AVHWAccel.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:07:11 UTC 2013


The following commit has been merged in the experimental branch:
commit 48962f2eb71c41fe30a0b790c318c1c6d953ef3b
Author: Laurent Aimar <fenrir at videolan.org>
Date:   Fri May 14 23:09:08 2010 +0000

    Reindent after last commit on dxva2 h264 AVHWAccel.
    
    Originally committed as revision 23141 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index b0b126a..332a763 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -57,14 +57,14 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context
     pp->UsedForReferenceFlags  = 0;
     pp->NonExistingFrameFlags  = 0;
     for (i = 0, j = 0; i < FF_ARRAY_ELEMS(pp->RefFrameList); i++) {
-            const Picture *r;
-            if (j < h->short_ref_count) {
-                r = h->short_ref[j++];
-            } else {
-                r = NULL;
-                while (!r && j < h->short_ref_count + 16)
-                    r = h->long_ref[j++ - h->short_ref_count];
-            }
+        const Picture *r;
+        if (j < h->short_ref_count) {
+            r = h->short_ref[j++];
+        } else {
+            r = NULL;
+            while (!r && j < h->short_ref_count + 16)
+                r = h->long_ref[j++ - h->short_ref_count];
+        }
         if (r) {
             fill_picture_entry(&pp->RefFrameList[i],
                                ff_dxva2_get_surface_index(ctx, r),

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list