git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4c12b8
)
oggparsetheora: return meaningful error codes
author
Anton Khirnov
<anton@khirnov.net>
Sun, 27 Oct 2013 08:35:30 +0000
(09:35 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 30 Oct 2013 07:45:25 +0000
(08:45 +0100)
libavformat/oggparsetheora.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparsetheora.c
b/libavformat/oggparsetheora.c
index
f2cfe1b
..
3d5785b
100644
(file)
--- 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,10
+117,10
@@
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:
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
if ((err = av_reallocp(&st->codec->extradata,