summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-04-11 00:29:30 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-21 07:10:16 +0200
commit79157f400bec7fdb6385befa63fdafc727378143 (patch)
treea3253635ed91559625375d66b73b04471733c463 /libavutil
parent58f8463947e56dc448baeeabd7875ea90bdb4a98 (diff)
downloadffmpeg-79157f400bec7fdb6385befa63fdafc727378143.tar.gz
error: remove AVERROR_NUMEXPECTED
AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and has a too much specific meaning, which is better explained through a log message. Thus it can be replaced by AVERROR(EINVAL). This breaks API. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/error.c1
-rw-r--r--libavutil/error.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/error.c b/libavutil/error.c
index 3c3f03fe9b..252007a6c9 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -27,7 +27,6 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
switch (errnum) {
case AVERROR_EOF: errstr = "End of file"; break;
case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input"; break;
- case AVERROR_NUMEXPECTED: errstr = "Number syntax expected in filename"; break;
case AVERROR_PATCHWELCOME: errstr = "Not yet implemented in Libav, patches welcome"; break;
case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break;
case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found"; break;
diff --git a/libavutil/error.h b/libavutil/error.h
index 23e0b01789..62e75e136d 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -42,7 +42,6 @@
#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in Libav, patches welcome
#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_DEMUXER_NOT_FOUND (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found
#define AVERROR_MUXER_NOT_FOUND (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found