[FFmpeg-cvslog] oggparsetheora: return meaningful error codes

Anton Khirnov git at videolan.org
Wed Oct 30 10:41:08 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 27 09:35:30 2013 +0100| [5e5fb21877d8da7b3b8a27bb4d6a070d210c152d] | committer: Anton Khirnov

oggparsetheora: return meaningful error codes

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e5fb21877d8da7b3b8a27bb4d6a070d210c152d
---

 libavformat/oggparsetheora.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index f2cfe1b..3d5785b 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,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,



More information about the ffmpeg-cvslog mailing list