# HG changeset patch # User stefano # Date 1268601389 0 # Node ID bac1abbd0702461a7843b37d87dc1bcd1e379bbb # Parent e442be7463aa3a0eb676fdc529f53357d41756d4 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. diff -r e442be7463aa -r bac1abbd0702 error.h --- a/error.h Sun Mar 14 01:32:44 2010 +0000 +++ b/error.h Sun Mar 14 21:16:29 2010 +0000 @@ -38,6 +38,7 @@ #define AVERROR_IO AVERROR(EIO) /**< I/O error */ #define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */ #define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */ +#define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */ #define AVERROR_UNKNOWN AVERROR(EINVAL) /**< unknown error */ #endif @@ -45,8 +46,11 @@ #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_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */ #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 */