[SCM] libav/experimental: Indentation

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:06:40 UTC 2013


The following commit has been merged in the experimental branch:
commit e5c29287cf495ca83faecd1b94caf2e130481f55
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:26:03 2007 +0000

    Indentation
    
    Originally committed as revision 10384 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index c50c155..ec44d17 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -772,29 +772,29 @@ static int mkv_write_trailer(AVFormatContext *s)
     end_ebml_master(pb, mkv->cluster);
 
     if (!url_is_streamed(pb)) {
-    cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
-    second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead);
+        cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
+        second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead);
 
-    ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES    , cuespos);
-    if (ret < 0) return ret;
-    ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead);
-    if (ret < 0) return ret;
-    mkv_write_seekhead(pb, mkv->main_seekhead);
-
-    // update the duration
-    av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
-    currentpos = url_ftell(pb);
-    url_fseek(pb, mkv->duration_offset, SEEK_SET);
-    put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration);
-
-    // write the md5sum of some frames as the segment UID
-    if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
-        uint8_t segment_uid[16];
-        av_md5_final(mkv->md5_ctx, segment_uid);
-        url_fseek(pb, mkv->segment_uid, SEEK_SET);
-        put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
-    }
-    url_fseek(pb, currentpos, SEEK_SET);
+        ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES    , cuespos);
+        if (ret < 0) return ret;
+        ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead);
+        if (ret < 0) return ret;
+        mkv_write_seekhead(pb, mkv->main_seekhead);
+
+        // update the duration
+        av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
+        currentpos = url_ftell(pb);
+        url_fseek(pb, mkv->duration_offset, SEEK_SET);
+        put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration);
+
+        // write the md5sum of some frames as the segment UID
+        if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
+            uint8_t segment_uid[16];
+            av_md5_final(mkv->md5_ctx, segment_uid);
+            url_fseek(pb, mkv->segment_uid, SEEK_SET);
+            put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
+        }
+        url_fseek(pb, currentpos, SEEK_SET);
     }
 
     end_ebml_master(pb, mkv->segment);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list