From: Stefano Sabatini Date: Sat, 13 Mar 2010 19:19:46 +0000 (+0000) Subject: Mark AVERROR_ENOMEM to be deleted at the next major bump. X-Git-Tag: v0.6~617 X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=7c074320ba4a16e8d47cc9b3510bd28885b8dd4c;p=coroid%2Flibav_saccubus.git 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. Originally committed as revision 22514 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavutil/error.h b/libavutil/error.h index 88e98d35a..89e122c98 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -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. */