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/dfa.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/dfa.c')
| -rw-r--r-- | libavformat/dfa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/dfa.c b/libavformat/dfa.c index a5ecfd9b15..d667cd6277 100644 --- a/libavformat/dfa.c +++ b/libavformat/dfa.c @@ -40,7 +40,7 @@ static int dfa_read_header(AVFormatContext *s) { AVIOContext *pb = s->pb; AVStream *st; - int frames; + int frames, ret; int version; uint32_t mspf; @@ -69,8 +69,8 @@ static int dfa_read_header(AVFormatContext *s) avio_skip(pb, 128 - 16); // padding st->duration = frames; - if (ff_alloc_extradata(st->codecpar, 2)) - return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(st->codecpar, 2)) < 0) + return ret; AV_WL16(st->codecpar->extradata, version); if (version == 0x100) st->sample_aspect_ratio = (AVRational){2, 1}; |