aboutsummaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorStefano Sabatini2010-03-19 23:34:36 +0000
committerStefano Sabatini2010-03-19 23:34:36 +0000
commit72af5d8a020e4dca1118b3ede67be983b33e27c5 (patch)
treea7967be2f06d8caab38ad6d8a9c937cdafe06372 /libavutil
parent00291565895c1c764ac6a36ef221fcef0046220f (diff)
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
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/error.h b/libavutil/error.h
index b99c9aa765..c3ac31ef20 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -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