# HG changeset patch # User stefano # Date 1268507986 0 # Node ID ff823129a7879b31a14031913367012ba17225df # Parent 30f20f8cf016db03d4a9cbb533aa2cf9f216517b Mark AVERROR_ENOMEM to be deleted at the next major bump. AVERROR(ENOMEM) must be used instead, and there are no occurrences of AVERROR_ENOMEM in the FFmpeg basecode so it can be safely dropped. diff -r 30f20f8cf016 -r ff823129a787 error.h --- a/error.h Sat Mar 13 19:19:44 2010 +0000 +++ b/error.h Sat Mar 13 19:19:46 2010 +0000 @@ -37,11 +37,11 @@ #if LIBAVUTIL_VERSION_MAJOR < 51 #define AVERROR_UNKNOWN AVERROR(EINVAL) /**< unknown error */ #define AVERROR_IO AVERROR(EIO) /**< I/O error */ +#define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */ #endif #define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */ #define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< invalid data found */ -#define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */ #define AVERROR_NOFMT AVERROR(EILSEQ) /**< unknown format */ #define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */ #define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */