diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-12-10 22:59:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-12 19:25:33 +0100 |
| commit | c1e439d7e9abab3cebdc937636393b1656e095d9 (patch) | |
| tree | be0ae941a23b62c42b152e2b9aa0a22f8c793d4e /libavformat/vc1test.c | |
| parent | cb88cdf7730e309df22ddbbc1ae4ebcd9ebc529e (diff) | |
| download | ffmpeg-c1e439d7e9abab3cebdc937636393b1656e095d9.tar.gz | |
avformat: Forward errors where possible
It is not uncommon to find code where the caller thinks to know better
what the return value should be than the callee. E.g. something like
"if (av_new_packet(pkt, size) < 0) return AVERROR(ENOMEM);". This commit
changes several instances of this to instead forward the actual error.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/vc1test.c')
| -rw-r--r-- | libavformat/vc1test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index 3c677931fc..ff57f44b14 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -51,7 +51,7 @@ static int vc1t_read_header(AVFormatContext *s) { AVIOContext *pb = s->pb; AVStream *st; - int frames; + int frames, ret; uint32_t fps; uint32_t size; @@ -67,8 +67,8 @@ static int vc1t_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_WMV3; - if (ff_get_extradata(s, st->codecpar, pb, VC1_EXTRADATA_SIZE) < 0) - return AVERROR(ENOMEM); + if ((ret = ff_get_extradata(s, st->codecpar, pb, VC1_EXTRADATA_SIZE)) < 0) + return ret; avio_skip(pb, size - 4); st->codecpar->height = avio_rl32(pb); |