[SCM] libav/experimental: return error if av_write_header failed (it fails on some containers when codec is not supported)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f75cdda7185b5bb12da438a51cb9b7c5c59e51a1
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Sat Feb 24 02:24:42 2007 +0000

    return error if av_write_header failed (it fails on some containers when codec is not supported)
    
    Originally committed as revision 8110 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffserver.c b/ffserver.c
index 7b64cc7..696c9a9 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2033,7 +2033,8 @@ static int http_prepare_data(HTTPContext *c)
         c->fmt_ctx.pb.is_streamed = 1;
 
         av_set_parameters(&c->fmt_ctx, NULL);
-        av_write_header(&c->fmt_ctx);
+        if (av_write_header(&c->fmt_ctx) < 0)
+            return -1;
 
         len = url_close_dyn_buf(&c->fmt_ctx.pb, &c->pb_buffer);
         c->buffer_ptr = c->pb_buffer;
@@ -3525,7 +3526,10 @@ static void build_feed_streams(void)
                 s->streams[i] = st;
             }
             av_set_parameters(s, NULL);
-            av_write_header(s);
+            if (av_write_header(s) < 0) {
+                fprintf(stderr, "Container doesn't supports the required parameters\n");
+                exit(1);
+            }
             /* XXX: need better api */
             av_freep(&s->priv_data);
             url_fclose(&s->pb);

-- 
Libav/FFmpeg packaging