diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-14 21:16:29 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-14 21:16:29 +0000 |
| commit | 73ddbd9d0e2cc23826646c03d190ebeba9074dfa (patch) | |
| tree | 682f3db44a1ebc2bc1e8045183914b5988c609db /libavutil | |
| parent | c26bce1070a409ae2fefce8fb43d26228d108f7e (diff) | |
| download | ffmpeg-73ddbd9d0e2cc23826646c03d190ebeba9074dfa.tar.gz | |
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.
Originally committed as revision 22528 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/error.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/error.h b/libavutil/error.h index 4ff2a6f26b..61b8e1dd06 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -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 */ |