avformat/matroskadec: fix the type of the TrackLanguage

[ffmpeg] / libavformat / hnm.c

diff --git a/libavformat/hnm.c b/libavformat/hnm.c
index 24d4e808a543991c69b2a87df5aa885db531ae83..31221553a4a8c0673eb627ffd4b042bb64a62821 100644 (file)
--- a/libavformat/hnm.c
+++ b/libavformat/hnm.c
@@ -52,7 +52,7 @@ typedef struct Hnm4DemuxContext {
     AVPacket vpkt;
 } Hnm4DemuxContext;
 
-static int hnm_probe(AVProbeData *p)
+static int hnm_probe(const AVProbeData *p)
 {
     if (p->buf_size < 4)
         return 0;
@@ -70,6 +70,7 @@ static int hnm_read_header(AVFormatContext *s)
     Hnm4DemuxContext *hnm = s->priv_data;
     AVIOContext *pb = s->pb;
     AVStream *vst;
+    int ret;
 
     /* default context members */
     hnm->pts = 0;
@@ -113,10 +114,10 @@ static int hnm_read_header(AVFormatContext *s)
     vst->codecpar->codec_tag  = 0;
     vst->codecpar->width      = hnm->width;
     vst->codecpar->height     = hnm->height;
-    vst->codecpar->extradata  = av_mallocz(1);
+    if ((ret = ff_alloc_extradata(vst->codecpar, 1)) < 0)
+        return ret;
 
-    vst->codecpar->extradata_size = 1;
-    memcpy(vst->codecpar->extradata, &hnm->version, 1);
+    vst->codecpar->extradata[0] = hnm->version;
 
     vst->start_time = 0;