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/rsd.c | |
| parent | cb88cdf7730e309df22ddbbc1ae4ebcd9ebc529e (diff) | |
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/rsd.c')
| -rw-r--r-- | libavformat/rsd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 396a431f34..e23c8abae5 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -97,9 +97,8 @@ static int rsd_read_header(AVFormatContext *s) switch (par->codec_id) { case AV_CODEC_ID_XMA2: par->block_align = 2048; - ff_alloc_extradata(par, 34); - if (!par->extradata) - return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(par, 34)) < 0) + return ret; memset(par->extradata, 0, 34); break; case AV_CODEC_ID_ADPCM_PSX: |