[FFmpeg-cvslog] r19247 - trunk/libavformat/oggenc.c

jbr subversion
Sun Jun 21 22:16:48 CEST 2009


Author: jbr
Date: Sun Jun 21 22:16:48 2009
New Revision: 19247

Log:
oggenc: return error value from ogg_build_flac_headers()

Modified:
   trunk/libavformat/oggenc.c

Modified: trunk/libavformat/oggenc.c
==============================================================================
--- trunk/libavformat/oggenc.c	Sun Jun 21 22:14:58 2009	(r19246)
+++ trunk/libavformat/oggenc.c	Sun Jun 21 22:16:48 2009	(r19247)
@@ -149,10 +149,12 @@ static int ogg_write_header(AVFormatCont
         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,



More information about the ffmpeg-cvslog mailing list