avformat/nut: add support for per frame side & meta data with version 4

[ffmpeg] / libavformat / adxdec.c

diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index 0a0436f1847472bf9eb9c086a0e640aad3c99ce3..fe22c3ae697bb92a2306193c3c9e172ce426b53a 100644 (file)
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -78,13 +78,8 @@ static int adx_read_header(AVFormatContext *s)
     c->header_size = avio_rb16(s->pb) + 4;
     avio_seek(s->pb, -4, SEEK_CUR);
 
-    if (ff_alloc_extradata(avctx, c->header_size))
+    if (ff_get_extradata(avctx, s->pb, c->header_size) < 0)
         return AVERROR(ENOMEM);
-    if (avio_read(s->pb, avctx->extradata, c->header_size) < c->header_size) {
-        av_freep(&avctx->extradata);
-        return AVERROR(EIO);
-    }
-    avctx->extradata_size = c->header_size;
 
     ret = avpriv_adx_decode_header(avctx, avctx->extradata,
                                    avctx->extradata_size, &c->header_size,