[SCM] libav/experimental: Move new_output_stream() up for upcoming fix for issue 2317.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ec1ca41cef41a4180ba9d7331842602e15329d88
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Fri Oct 29 14:48:38 2010 +0000

    Move new_output_stream() up for upcoming fix for issue 2317.
    
    Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 7799868..33444c2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -633,6 +633,27 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
     }
 }
 
+static AVOutputStream *new_output_stream(AVFormatContext *oc, int file_idx)
+{
+    int idx = oc->nb_streams - 1;
+    AVOutputStream *ost;
+
+    output_streams_for_file[file_idx] =
+        grow_array(output_streams_for_file[file_idx],
+                   sizeof(*output_streams_for_file[file_idx]),
+                   &nb_output_streams_for_file[file_idx],
+                   oc->nb_streams);
+    ost = output_streams_for_file[file_idx][idx] =
+        av_mallocz(sizeof(AVOutputStream));
+    if (!ost) {
+        fprintf(stderr, "Could not alloc output stream\n");
+        ffmpeg_exit(1);
+    }
+    ost->file_index = file_idx;
+    ost->index = idx;
+    return ost;
+}
+
 static int read_ffserver_streams(AVFormatContext *s, const char *filename)
 {
     int i, err;
@@ -3204,27 +3225,6 @@ static void check_audio_video_sub_inputs(int *has_video_ptr, int *has_audio_ptr,
     *has_subtitle_ptr = has_subtitle;
 }
 
-static AVOutputStream *new_output_stream(AVFormatContext *oc, int file_idx)
-{
-    int idx = oc->nb_streams - 1;
-    AVOutputStream *ost;
-
-    output_streams_for_file[file_idx] =
-        grow_array(output_streams_for_file[file_idx],
-                   sizeof(*output_streams_for_file[file_idx]),
-                   &nb_output_streams_for_file[file_idx],
-                   oc->nb_streams);
-    ost = output_streams_for_file[file_idx][idx] =
-        av_mallocz(sizeof(AVOutputStream));
-    if (!ost) {
-        fprintf(stderr, "Could not alloc output stream\n");
-        ffmpeg_exit(1);
-    }
-    ost->file_index = file_idx;
-    ost->index = idx;
-    return ost;
-}
-
 static void new_video_stream(AVFormatContext *oc, int file_idx)
 {
     AVStream *st;

-- 
Libav/FFmpeg packaging