[FFmpeg-devel] [PATCH 34/41] avformat/flic: use ff_alloc_extradata()

Paul B Mahol onemda at gmail.com
Sun Oct 13 14:48:55 CEST 2013


Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavformat/flic.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavformat/flic.c b/libavformat/flic.c
index e04e277..7235f2e 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -125,10 +125,8 @@ static int flic_read_header(AVFormatContext *s)
     }
 
     /* send over the whole 128-byte FLIC header */
-    st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
-    if (!st->codec->extradata)
+    if (ff_alloc_extradata(st->codec, FLIC_HEADER_SIZE))
         return AVERROR(ENOMEM);
-    st->codec->extradata_size = FLIC_HEADER_SIZE;
     memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
 
     /* peek at the preamble to detect TFTD videos - they seem to always start with an audio chunk */
@@ -178,10 +176,8 @@ static int flic_read_header(AVFormatContext *s)
 
         /* send over abbreviated FLIC header chunk */
         av_free(st->codec->extradata);
-        st->codec->extradata = av_malloc(12);
-        if (!st->codec->extradata)
+        if (ff_alloc_extradata(st->codec, 12))
             return AVERROR(ENOMEM);
-        st->codec->extradata_size = 12;
         memcpy(st->codec->extradata, header, 12);
 
     } else if (magic_number == FLIC_FILE_MAGIC_1) {
-- 
1.7.11.2



More information about the ffmpeg-devel mailing list