[SCM] libav/experimental: fix indention

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:54 UTC 2013


The following commit has been merged in the experimental branch:
commit 620e8baffae8fafd14bbe1f2318e62ea6a06866a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Mar 15 23:45:45 2007 +0000

    fix indention
    
    Originally committed as revision 8421 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 8e034cc..1b919d0 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1366,26 +1366,26 @@ static int video_thread(void *arg)
 
         /* NOTE: ipts is the PTS of the _first_ picture beginning in
            this packet, if any */
-            global_video_pkt_pts= pkt->pts;
-            len1 = avcodec_decode_video(is->video_st->codec,
-                                        frame, &got_picture,
-                                        pkt->data, pkt->size);
-
-            if(   (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
-               && frame->opaque && *(uint64_t*)frame->opaque != AV_NOPTS_VALUE)
-                pts= *(uint64_t*)frame->opaque;
-            else if(pkt->dts != AV_NOPTS_VALUE)
-                pts= pkt->dts;
-            else
-                pts= 0;
-            pts *= av_q2d(is->video_st->time_base);
+        global_video_pkt_pts= pkt->pts;
+        len1 = avcodec_decode_video(is->video_st->codec,
+                                    frame, &got_picture,
+                                    pkt->data, pkt->size);
+
+        if(   (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
+           && frame->opaque && *(uint64_t*)frame->opaque != AV_NOPTS_VALUE)
+            pts= *(uint64_t*)frame->opaque;
+        else if(pkt->dts != AV_NOPTS_VALUE)
+            pts= pkt->dts;
+        else
+            pts= 0;
+        pts *= av_q2d(is->video_st->time_base);
 
 //            if (len1 < 0)
 //                break;
-            if (got_picture) {
-                if (output_picture2(is, frame, pts) < 0)
-                    goto the_end;
-            }
+        if (got_picture) {
+            if (output_picture2(is, frame, pts) < 0)
+                goto the_end;
+        }
         av_free_packet(pkt);
         if (step)
             if (cur_stream)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list