diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-11 00:29:30 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-21 07:10:16 +0200 |
| commit | 79157f400bec7fdb6385befa63fdafc727378143 (patch) | |
| tree | a3253635ed91559625375d66b73b04471733c463 | |
| parent | 58f8463947e56dc448baeeabd7875ea90bdb4a98 (diff) | |
| download | ffmpeg-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>
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/error.c | 1 | ||||
| -rw-r--r-- | libavutil/error.h | 1 |
4 files changed, 2 insertions, 4 deletions
@@ -3722,7 +3722,7 @@ static void opt_output_file(const char *filename) /* check filename in case of an image number is expected */ if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (!av_filename_number_test(oc->filename)) { - print_error(oc->filename, AVERROR_NUMEXPECTED); + print_error(oc->filename, AVERROR(EINVAL)); ffmpeg_exit(1); } } diff --git a/libavformat/utils.c b/libavformat/utils.c index 19498b96a4..88e9a49e87 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -581,7 +581,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, /* check filename in case an image number is expected */ if (fmt->flags & AVFMT_NEEDNUMBER) { if (!av_filename_number_test(filename)) { - err = AVERROR_NUMEXPECTED; + err = AVERROR(EINVAL); goto fail; } } 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 |