RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/ffmdec: return proper error code in ffm2_read_header() 

Also log an error message in case of invalid packet size.
This commit is contained in:
Stefano Sabatini 2014-09-01 14:04:54 +02:00
parent 39b517fac0
commit 6f0fc1a96b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/ffmdec.c
View File

@ -236,10 +236,16 @@ static int ffm2_read_header(AVFormatContext *s)
AVStream *st;
AVIOContext *pb = s->pb;
AVCodecContext *codec;
int ret;
ffm->packet_size = avio_rb32(pb);
if (ffm->packet_size != FFM_PACKET_SIZE)
if (ffm->packet_size != FFM_PACKET_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid packet size %d, expected size was %d\n",
ffm->packet_size, FFM_PACKET_SIZE);
ret = AVERROR_INVALIDDATA;
goto fail;
}
ffm->write_index = avio_rb64(pb);
/* get also filesize */
if (pb->seekable) {
@ -266,8 +272,10 @@ static int ffm2_read_header(AVFormatContext *s)
break;
case MKBETAG('C', 'O', 'M', 'M'):
st = avformat_new_stream(s, NULL);
if (!st)
if (!st) {
ret = AVERROR(ENOMEM);
goto fail;
}
avpriv_set_pts_info(st, 64, 1, 1000000);
@ -359,7 +367,7 @@ static int ffm2_read_header(AVFormatContext *s)
return 0;
fail:
ffm_close(s);
return -1;
return ret;
}
static int ffm_read_header(AVFormatContext *s)