diff options
| author | Andreas Rheinhardt <[email protected]> | 2019-12-10 22:59:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-12-12 19:25:33 +0100 |
| commit | c1e439d7e9abab3cebdc937636393b1656e095d9 (patch) | |
| tree | be0ae941a23b62c42b152e2b9aa0a22f8c793d4e /libavformat/flic.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 <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/flic.c')
| -rw-r--r-- | libavformat/flic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/flic.c b/libavformat/flic.c index d7844ce04f..4ba72fb037 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -89,7 +89,7 @@ static int flic_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; unsigned char header[FLIC_HEADER_SIZE]; AVStream *st, *ast; - int speed; + int speed, ret; int magic_number; unsigned char preamble[FLIC_PREAMBLE_SIZE]; @@ -125,8 +125,8 @@ static int flic_read_header(AVFormatContext *s) } /* send over the whole 128-byte FLIC header */ - if (ff_alloc_extradata(st->codecpar, FLIC_HEADER_SIZE)) - return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(st->codecpar, FLIC_HEADER_SIZE)) < 0) + return ret; memcpy(st->codecpar->extradata, header, FLIC_HEADER_SIZE); /* peek at the preamble to detect TFTD videos - they seem to always start with an audio chunk */ @@ -176,8 +176,8 @@ static int flic_read_header(AVFormatContext *s) /* send over abbreviated FLIC header chunk */ av_freep(&st->codecpar->extradata); - if (ff_alloc_extradata(st->codecpar, 12)) - return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(st->codecpar, 12)) < 0) + return ret; memcpy(st->codecpar->extradata, header, 12); } else if (magic_number == FLIC_FILE_MAGIC_1) { |