[PATCH 2/7] Make AVERROR_NOTSUPP a deprecated alias for the new symbol AVERROR_INVALIDOPERATION. The new name better expresses the meaning of the error code.

Stefano Sabatini stefano.sabatini-lala
Fri Apr 2 15:16:37 CEST 2010


---
 libavutil/error.c |    2 +-
 libavutil/error.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavutil/error.c b/libavutil/error.c
index b69ddbd..fed846a 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -27,7 +27,7 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
     switch (errnum) {
     case AVERROR_EOF:               errstr = "End of file"; break;
     case AVERROR_INVALIDDATA:       errstr = "Invalid data found when processing input"; break;
-    case AVERROR_NOTSUPP:           errstr = "Invalid or illegal operation requested"; break;
+    case AVERROR_INVALIDOPERATION:  errstr = "Invalid or illegal operation requested"; break;
     case AVERROR_NUMEXPECTED:       errstr = "Number syntax expected in filename"; break;
     case AVERROR_PATCHWELCOME:      errstr = "Not yet implemented in FFmpeg, patches welcome"; break;
     }
diff --git a/libavutil/error.h b/libavutil/error.h
index f523efe..590e5c6 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -48,7 +48,8 @@
 #endif
 
 #define AVERROR_EOF         AVERROR(EPIPE)   ///< End of file
-#define AVERROR_NOTSUPP     AVERROR(ENOSYS)  ///< Invalid or illegal operation requested. The requested operation cannot be executed or implemented.
+#define AVERROR_INVALIDOPERATION AVERROR(ENOSYS)  ///< Invalid or illegal operation requested. The requested operation cannot be executed or implemented.
+#define AVERROR_NOTSUPP     AVERROR_INVALIDOPERATION ///< @deprecated Use AVERROR_INVALIDOPERATION instead.
 
 #define AVERROR_PATCHWELCOME    (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
 
-- 
1.7.0


--aM3YZ0Iwxop3KEKx
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-Change-the-definition-of-AVERROR_INVALIDOPERATION-at.patch"




More information about the ffmpeg-devel mailing list