Simplify FLAC extradata (streaminfo) parsing

[vlc] / modules / codec / avcodec / encoder.c

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index cbbe13a3a28b3fd39a95d39bca3fcc4d52b5d3f3..9717d099b8c3b14c2a4165b425b61b0caacfad53 100644 (file)
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -822,41 +822,16 @@ int OpenEncoder( vlc_object_t *p_this )
 
     av_dict_free(&options);
 
-    if( i_codec_id == AV_CODEC_ID_FLAC )
+    p_enc->fmt_out.i_extra = p_context->extradata_size;
+    if( p_enc->fmt_out.i_extra )
     {
-        p_enc->fmt_out.i_extra = 4 + 1 + 3 + p_context->extradata_size;
         p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
-        if( p_enc->fmt_out.p_extra )
+        if ( p_enc->fmt_out.p_extra == NULL )
         {
-            uint8_t *p = p_enc->fmt_out.p_extra;
-            p[0] = 0x66;    /* f */
-            p[1] = 0x4C;    /* L */
-            p[2] = 0x61;    /* a */
-            p[3] = 0x43;    /* C */
-            p[4] = 0x80;    /* streaminfo block, last block before audio */
-            p[5] = ( p_context->extradata_size >> 16 ) & 0xff;
-            p[6] = ( p_context->extradata_size >>  8 ) & 0xff;
-            p[7] = ( p_context->extradata_size       ) & 0xff;
-            memcpy( &p[8], p_context->extradata, p_context->extradata_size );
-        }
-        else
-        {
-            p_enc->fmt_out.i_extra = 0;
-        }
-    }
-    else
-    {
-        p_enc->fmt_out.i_extra = p_context->extradata_size;
-        if( p_enc->fmt_out.i_extra )
-        {
-            p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
-            if ( p_enc->fmt_out.p_extra == NULL )
-            {
-                goto error;
-            }
-            memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
-                    p_enc->fmt_out.i_extra );
+            goto error;
         }
+        memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
+                p_enc->fmt_out.i_extra );
     }
 
     p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;