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

Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'

Browse Source 
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
  oggparsetheora: return meaningful error codes

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-30 10:35:29 +01:00
commit 0b9e480b8f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/oggparsetheora.c
View File

@ -68,7 +68,7 @@ static int theora_header(AVFormatContext *s, int idx)
if (thp->version < 0x030100) { if (thp->version < 0x030100) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Too old or unsupported Theora (%x)\n", thp->version); "Too old or unsupported Theora (%x)\n", thp->version);
return -1; return AVERROR(ENOSYS);
} }
width = get_bits(&gb, 16) << 4; width = get_bits(&gb, 16) << 4;
@ -117,11 +117,11 @@ static int theora_header(AVFormatContext *s, int idx)
ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7); ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7);
case 0x82: case 0x82:
if (!thp->version) if (!thp->version)
return -1; return AVERROR_INVALIDDATA;
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "Unknown header type %X\n", os->buf[os->pstart]); av_log(s, AV_LOG_ERROR, "Unknown header type %X\n", os->buf[os->pstart]);
return -1; return AVERROR_INVALIDDATA;
} }
if ((err = av_reallocp(&st->codec->extradata, if ((err = av_reallocp(&st->codec->extradata,