Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / samidec.c

diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 85fd220f4af3d0ed72c9cb50f8e9d9901bb44eb7..2eaee6f24b1de25523d6b466a95b858c98bbc043 100644 (file)
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -27,6 +27,7 @@
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
+#include "libavcodec/internal.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
@@ -91,13 +92,9 @@ static int sami_read_header(AVFormatContext *s)
         av_bprint_clear(&buf);
     }
 
-    st->codec->extradata_size = hdr_buf.len + 1;
-    av_bprint_finalize(&hdr_buf, (char **)&st->codec->extradata);
-    if (!st->codec->extradata) {
-        st->codec->extradata_size = 0;
-        res = AVERROR(ENOMEM);
+    res = avpriv_bprint_to_extradata(st->codec, &hdr_buf);
+    if (res < 0)
         goto end;
-    }
 
     ff_subtitles_queue_finalize(&sami->q);
 
@@ -136,6 +133,5 @@ AVInputFormat ff_sami_demuxer = {
     .read_packet    = sami_read_packet,
     .read_seek2     = sami_read_seek,
     .read_close     = sami_read_close,
-    .flags          = AVFMT_GENERIC_INDEX,
     .extensions     = "smi,sami",
 };