# HG changeset patch # User stefano # Date 1269041676 0 # Node ID 4d4d42771661015ee409f547113223b3f0d2be53 # Parent 25135d2dca105311a53a8f640590c483583b0a5c Change the definition of AVERROR_INVALIDDATA at the next libavutil major bump, using an FFmpeg specific error code rather than EINVAL, which has a quite different semantics. diff -r 25135d2dca10 -r 4d4d42771661 error.h --- a/error.h Fri Mar 19 23:34:34 2010 +0000 +++ b/error.h Fri Mar 19 23:34:36 2010 +0000 @@ -38,6 +38,7 @@ #endif #if LIBAVUTIL_VERSION_MAJOR < 51 +#define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< Invalid data found when processing input */ #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 */ @@ -46,13 +47,13 @@ #endif #define AVERROR_EOF AVERROR(EPIPE) /**< End of file. */ -#define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< Invalid data found when processing input */ #define AVERROR_NOFMT AVERROR(EILSEQ) /**< unknown format */ #define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */ #define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) /**< Not yet implemented in FFmpeg. Patches welcome. */ #if LIBAVUTIL_VERSION_MAJOR > 50 +#define AVERROR_INVALIDDATA (-MKTAG('I','N','D','A')) /**< Invalid data found when processing input */ #define AVERROR_NUMEXPECTED (-MKTAG('N','U','E','X')) /**< Number syntax expected in filename. */ #endif