[PATCH 4/5] Change the definition of AVERROR_NUMEXPECTED at the next libavutil major bump, using an FFmpeg specific error code rather than EDOM, which has a quite different semantics.
Stefano Sabatini
stefano.sabatini-lala
Sat Mar 13 21:12:24 CET 2010
---
libavutil/error.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libavutil/error.h b/libavutil/error.h
index 71804fb..53470cf 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -44,13 +44,17 @@
#define AVERROR_IO AVERROR(EIO) /**< I/O error */
#define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */
#define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */
+#define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */
#endif
-#define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */
#define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< invalid data found */
#define AVERROR_NOFMT AVERROR(EILSEQ) /**< unknown format */
#define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */
#define AVERROR_EOF AVERROR(EPIPE) /**< End of file. */
#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) /**< Not yet implemented in FFmpeg. Patches welcome. */
+#if LIBAVUTIL_VERSION_MAJOR > 50
+#define AVERROR_NUMEXPECTED (-MKTAG('N','U','E','X')) /**< Number syntax expected in filename. */
+#endif
+
#endif /* AVUTIL_ERROR_H */
--
1.6.6.1
--6c2NcOVqGQ03X4Wi--
More information about the ffmpeg-devel
mailing list