Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / flacenc_header.c

diff --git a/libavformat/flacenc_header.c b/libavformat/flacenc_header.c
index 389efbd01a25e27af197c3f7e4b1d84270537a2b..e16c14bf535f77de170f5519fbf9ca0cf749cad5 100644 (file)
--- a/libavformat/flacenc_header.c
+++ b/libavformat/flacenc_header.c
@@ -34,16 +34,14 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec,
     enum FLACExtradataFormat format;
 
     header[4] = last_block ? 0x80 : 0x00;
-    if (!ff_flac_is_extradata_valid(codec, &format, &streaminfo))
+    if (!avpriv_flac_is_extradata_valid(codec, &format, &streaminfo))
         return -1;
 
-    /* write "fLaC" stream marker and first metadata block header if needed */
-    if (format == FLAC_EXTRADATA_FORMAT_STREAMINFO) {
-        avio_write(pb, header, 8);
-    }
+    /* write "fLaC" stream marker and first metadata block header */
+    avio_write(pb, header, 8);
 
-    /* write STREAMINFO or full header */
-    avio_write(pb, codec->extradata, codec->extradata_size);
+    /* write STREAMINFO */
+    avio_write(pb, streaminfo, FLAC_STREAMINFO_SIZE);
 
     return 0;
 }