[SCM] libav/experimental: oggenc: return error value from ogg_build_flac_headers()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3f2eadf4fe7e91e467501fa7108d2bf49f8c1ae1
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sun Jun 21 20:16:48 2009 +0000

    oggenc: return error value from ogg_build_flac_headers()
    
    Originally committed as revision 19247 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index afed87f..d36b0c4 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -149,10 +149,12 @@ static int ogg_write_header(AVFormatContext *s)
         oggstream = av_mallocz(sizeof(*oggstream));
         st->priv_data = oggstream;
         if (st->codec->codec_id == CODEC_ID_FLAC) {
-            if (ogg_build_flac_headers(st->codec,
-                                       oggstream, st->codec->flags & CODEC_FLAG_BITEXACT) < 0) {
+            int err = ogg_build_flac_headers(st->codec, oggstream,
+                                             st->codec->flags & CODEC_FLAG_BITEXACT);
+            if (err) {
                 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
                 av_freep(&st->priv_data);
+                return err;
             }
         } else {
             if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,

-- 
Libav/FFmpeg packaging