diff options
| author | James Almer <jamrial@gmail.com> | 2015-10-16 16:09:10 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-10-16 16:11:58 -0300 |
| commit | 8297f560cca286b4a5179556298fd96183c769e9 (patch) | |
| tree | ae2217598652a63d22ee1bce0fef7a26137f471c /libavformat/rsd.c | |
| parent | 2b5dda3f486125584ddfa2c01c76458f1f59094e (diff) | |
| download | ffmpeg-8297f560cca286b4a5179556298fd96183c769e9.tar.gz | |
avformat/rsd: propagate return values of extradata helper functions
They can return errors other than ENOMEM
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/rsd.c')
| -rw-r--r-- | libavformat/rsd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 6c43b1464a..99912be15f 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -55,7 +55,7 @@ static int rsd_probe(AVProbeData *p) static int rsd_read_header(AVFormatContext *s) { AVIOContext *pb = s->pb; - int i, version, start = 0x800; + int i, ret, version, start = 0x800; AVCodecContext *codec; AVStream *st = avformat_new_stream(s, NULL); @@ -116,8 +116,8 @@ static int rsd_read_header(AVFormatContext *s) start = avio_rl32(pb); - if (ff_get_extradata(codec, s->pb, 32) < 0) - return AVERROR(ENOMEM); + if ((ret = ff_get_extradata(codec, s->pb, 32)) < 0) + return ret; for (i = 0; i < 16; i++) AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2)); @@ -126,8 +126,8 @@ static int rsd_read_header(AVFormatContext *s) codec->block_align = 8 * codec->channels; avio_skip(s->pb, 0x1A4 - avio_tell(s->pb)); - if (ff_alloc_extradata(st->codec, 32 * st->codec->channels) < 0) - return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(st->codec, 32 * st->codec->channels)) < 0) + return ret; for (i = 0; i < st->codec->channels; i++) { avio_read(s->pb, st->codec->extradata + 32 * i, 32); |