virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/rsd: propagate return values of extradata helper functions

Browse Source 
They can return errors other than ENOMEM

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2015-10-16 16:09:10 -03:00
parent 2b5dda3f48
commit 8297f560cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rsd.c
View File

@@ -55,7 +55,7 @@ static int rsd_probe(AVProbeData *p)
static int rsd_read_header(AVFormatContext *s) static int rsd_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int i, version, start = 0x800; int i, ret, version, start = 0x800;
AVCodecContext *codec; AVCodecContext *codec;
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
@@ -116,8 +116,8 @@ static int rsd_read_header(AVFormatContext *s)
start = avio_rl32(pb); start = avio_rl32(pb);
if (ff_get_extradata(codec, s->pb, 32) < 0) if ((ret = ff_get_extradata(codec, s->pb, 32)) < 0)
return AVERROR(ENOMEM); return ret;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2)); 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; codec->block_align = 8 * codec->channels;
avio_skip(s->pb, 0x1A4 - avio_tell(s->pb)); avio_skip(s->pb, 0x1A4 - avio_tell(s->pb));
if (ff_alloc_extradata(st->codec, 32 * st->codec->channels) < 0) if ((ret = ff_alloc_extradata(st->codec, 32 * st->codec->channels)) < 0)
return AVERROR(ENOMEM); return ret;
for (i = 0; i < st->codec->channels; i++) { for (i = 0; i < st->codec->channels; i++) {
avio_read(s->pb, st->codec->extradata + 32 * i, 32); avio_read(s->pb, st->codec->extradata + 32 * i, 32);