Commit 72af5d8a authored by Stefano Sabatini's avatar Stefano Sabatini

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.

Originally committed as revision 22601 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 00291565
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#endif #endif
#if LIBAVUTIL_VERSION_MAJOR < 51 #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_IO AVERROR(EIO) /**< I/O error */
#define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */ #define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */
#define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */ #define AVERROR_NOMEM AVERROR(ENOMEM) /**< not enough memory */
...@@ -46,13 +47,13 @@ ...@@ -46,13 +47,13 @@
#endif #endif
#define AVERROR_EOF AVERROR(EPIPE) /**< End of file. */ #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_NOFMT AVERROR(EILSEQ) /**< unknown format */
#define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */ #define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */
#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) /**< Not yet implemented in FFmpeg. Patches welcome. */ #define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) /**< Not yet implemented in FFmpeg. Patches welcome. */
#if LIBAVUTIL_VERSION_MAJOR > 50 #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. */ #define AVERROR_NUMEXPECTED (-MKTAG('N','U','E','X')) /**< Number syntax expected in filename. */
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment