[SCM] libav/experimental: move matroska_find_track_by_num() upper in the file so that it can be used by other part of the code

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:47 UTC 2013


The following commit has been merged in the experimental branch:
commit df06539a251d75c2358603c91b32d38d3e23458b
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Mon Apr 9 16:45:43 2007 +0000

    move matroska_find_track_by_num() upper in the file
    so that it can be used by other part of the code
    
    Originally committed as revision 8695 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 0473599..f6b4c66 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -974,6 +974,21 @@ ebml_read_header (MatroskaDemuxContext *matroska,
     return 0;
 }
 
+
+static int
+matroska_find_track_by_num (MatroskaDemuxContext *matroska,
+                            int                   num)
+{
+    int i;
+
+    for (i = 0; i < matroska->num_tracks; i++)
+        if (matroska->tracks[i]->num == num)
+            return i;
+
+    return -1;
+}
+
+
 /*
  * Put one packet in an application-supplied AVPacket struct.
  * Returns 0 on success or -1 on failure.
@@ -2354,19 +2369,6 @@ matroska_read_header (AVFormatContext    *s,
     return res;
 }
 
-static int
-matroska_find_track_by_num (MatroskaDemuxContext *matroska,
-                            int                   num)
-{
-    int i;
-
-    for (i = 0; i < matroska->num_tracks; i++)
-        if (matroska->tracks[i]->num == num)
-            return i;
-
-    return -1;
-}
-
 static inline int
 rv_offset(uint8_t *data, int slice, int slices)
 {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list