[FFmpeg-cvslog] avutil: add AVERROR_UNKNOWN

Justin Ruggles git at videolan.org
Sun Feb 26 05:21:46 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Feb 24 23:27:14 2012 -0500| [c9bca801324f03746757aef8549ebd26599adec2] | committer: Justin Ruggles

avutil: add AVERROR_UNKNOWN

Useful to return instead of -1 when the cause of the error is unknown,
typically from an external library.

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

 doc/APIchanges     |    3 +++
 libavutil/avutil.h |    4 ++--
 libavutil/error.c  |    1 +
 libavutil/error.h  |    1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 78e2bfc..0cdb3be 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -12,6 +12,9 @@ libavutil:   2011-04-18
 
 API changes, most recent first:
 
+2012-xx-xx - xxxxxxx - lavu 51.24.0 - error.h
+  Add AVERROR_UNKNOWN
+
 2012-xx-xx - xxxxxxx - lavc 54.x.x
   Add duration field to AVCodecParserContext
 
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 8d474e4..c9c7141 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -153,8 +153,8 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 23
-#define LIBAVUTIL_VERSION_MICRO  1
+#define LIBAVUTIL_VERSION_MINOR 24
+#define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
diff --git a/libavutil/error.c b/libavutil/error.c
index a330e9f..21b6876 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -39,6 +39,7 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
     case AVERROR_PROTOCOL_NOT_FOUND:errstr = "Protocol not found"                           ; break;
     case AVERROR_STREAM_NOT_FOUND:  errstr = "Stream not found"                             ; break;
     case AVERROR_BUG:               errstr = "Bug detected, please report the issue"        ; break;
+    case AVERROR_UNKNOWN:           errstr = "Unknown error occurred"                       ; break;
     }
 
     if (errstr) {
diff --git a/libavutil/error.h b/libavutil/error.h
index 2db65cb..11bcc5c 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -58,6 +58,7 @@
 #define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found
 #define AVERROR_STREAM_NOT_FOUND   (-MKTAG(0xF8,'S','T','R')) ///< Stream not found
 #define AVERROR_BUG                (-MKTAG( 'B','U','G',' ')) ///< Bug detected, please report the issue
+#define AVERROR_UNKNOWN            (-MKTAG( 'U','N','K','N')) ///< Unknown error, typically from an external library
 
 /**
  * Put a description of the AVERROR code errnum in errbuf.



More information about the ffmpeg-cvslog mailing list