summaryrefslogtreecommitdiff
path: root/libavformat/yop.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-01-02 16:25:26 +0100
committerPaul B Mahol <onemda@gmail.com>2019-01-02 16:25:26 +0100
commite8d36ba47753ef791e4589efbf3673b8c1dd3233 (patch)
treeea4f621042e415b68176b6164fee3cf564172c6a /libavformat/yop.c
parent1139887ace7f15053527cbc8b0a354899bcfcf63 (diff)
avformat/yop: use ff_get_extradata()
Diffstat (limited to 'libavformat/yop.c')
-rw-r--r--libavformat/yop.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/libavformat/yop.c b/libavformat/yop.c
index e6fd896668..b4b5fb4e15 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -68,10 +68,6 @@ static int yop_read_header(AVFormatContext *s)
if (!audio_stream || !video_stream)
return AVERROR(ENOMEM);
- // Extra data that will be passed to the decoder
- if (ff_alloc_extradata(video_stream->codecpar, 8))
- return AVERROR(ENOMEM);
-
// Audio
audio_par = audio_stream->codecpar;
audio_par->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -94,9 +90,9 @@ static int yop_read_header(AVFormatContext *s)
video_stream->sample_aspect_ratio = (AVRational){1, 2};
- ret = avio_read(pb, video_par->extradata, 8);
- if (ret < 8)
- return ret < 0 ? ret : AVERROR_EOF;
+ ret = ff_get_extradata(s, video_par, pb, 8);
+ if (ret < 0)
+ return ret;
yop->palette_size = video_par->extradata[0] * 3 + 4;
yop->audio_block_length = AV_RL16(video_par->extradata + 6);