diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:35:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:35:29 +0100 |
| commit | 0b9e480b8f3be266acf708bbab80d53bb7f48b7d (patch) | |
| tree | f705c39bd3e004e67bf15dbf9a9a09ee105df87f /libavformat/oggparsetheora.c | |
| parent | 70737b83f06e34a8b4f9eb70948b2f2ca6711992 (diff) | |
| parent | 5e5fb21877d8da7b3b8a27bb4d6a070d210c152d (diff) | |
| download | ffmpeg-0b9e480b8f3be266acf708bbab80d53bb7f48b7d.tar.gz | |
Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
oggparsetheora: return meaningful error codes
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsetheora.c')
| -rw-r--r-- | libavformat/oggparsetheora.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index c0290e6bf4..4508111fea 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -68,7 +68,7 @@ static int theora_header(AVFormatContext *s, int idx) if (thp->version < 0x030100) { av_log(s, AV_LOG_ERROR, "Too old or unsupported Theora (%x)\n", thp->version); - return -1; + return AVERROR(ENOSYS); } 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); case 0x82: if (!thp->version) - return -1; + return AVERROR_INVALIDDATA; break; default: 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, |