generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggdec/ogg_read_packet(): factorize failure code path

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-06 17:09:32 +02:00
parent c1b24ca762
commit 4ccd7cb45b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/oggdec.c
View File

@ -793,11 +793,8 @@ retry:
uint8_t *side_data = av_packet_new_side_data(pkt, uint8_t *side_data = av_packet_new_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES, AV_PKT_DATA_SKIP_SAMPLES,
10); 10);
if(side_data == NULL) { if(side_data == NULL)
av_free_packet(pkt); goto fail;
av_free(pkt);
return AVERROR(ENOMEM);
}
AV_WL32(side_data + 4, os->end_trimming); AV_WL32(side_data + 4, os->end_trimming);
os->end_trimming = 0; os->end_trimming = 0;
} }
@ -806,17 +803,19 @@ retry:
uint8_t *side_data = av_packet_new_side_data(pkt, uint8_t *side_data = av_packet_new_side_data(pkt,
AV_PKT_DATA_METADATA_UPDATE, AV_PKT_DATA_METADATA_UPDATE,
os->new_metadata_size); os->new_metadata_size);
if(side_data == NULL) { if(side_data == NULL)
av_free_packet(pkt); goto fail;
av_free(pkt);
return AVERROR(ENOMEM);
}
memcpy(side_data, os->new_metadata, os->new_metadata_size); memcpy(side_data, os->new_metadata, os->new_metadata_size);
av_freep(&os->new_metadata); av_freep(&os->new_metadata);
os->new_metadata_size = 0; os->new_metadata_size = 0;
} }
return psize; return psize;
fail:
av_free_packet(pkt);
av_free(pkt);
return AVERROR(ENOMEM);
} }
static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index, static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,