diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2010-12-19 09:01:02 +0000 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2010-12-19 09:01:02 +0000 |
| commit | 0bc55f5d32bb348369bfa48041a19b2ff080b8c7 (patch) | |
| tree | 11493c81545741488138bfc926ee37dba500a916 | |
| parent | eb066a4ce9e82cddb8f5af574804aa9889450b34 (diff) | |
| download | ffmpeg-0bc55f5d32bb348369bfa48041a19b2ff080b8c7.tar.gz | |
Add AVERROR_*_NOT_FOUND codes.
Originally committed as revision 26056 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/APIchanges | 11 | ||||
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/error.c | 8 | ||||
| -rw-r--r-- | libavutil/error.h | 9 |
4 files changed, 29 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 98682a0319..9612a9ff29 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,17 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-12-19 - r26056 - lavutil 50.35.0 - error.h + Add "not found" error codes: + AVERROR_DEMUXER_NOT_FOUND + AVERROR_MUXER_NOT_FOUND + AVERROR_DECODER_NOT_FOUND + AVERROR_ENCODER_NOT_FOUND + AVERROR_PROTOCOL_NOT_FOUND + AVERROR_FILTER_NOT_FOUND + AVERROR_BSF_NOT_FOUND + AVERROR_STREAM_NOT_FOUND + 2010-12-09 - r25923 - lavcore 0.16.0 - avcore.h Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from avcodec.h to avcore.h. diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 0ed4c8b776..213e577c29 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 50 -#define LIBAVUTIL_VERSION_MINOR 34 +#define LIBAVUTIL_VERSION_MINOR 35 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/error.c b/libavutil/error.c index b6d6019061..5cf54aadea 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -29,6 +29,14 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size) 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 FFmpeg, patches welcome"; break; + case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break; + case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found"; break; + case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break; + case AVERROR_ENCODER_NOT_FOUND: errstr = "Encoder not found"; break; + case AVERROR_PROTOCOL_NOT_FOUND:errstr = "Protocol not found"; break; + case AVERROR_FILTER_NOT_FOUND: errstr = "Filter not found"; break; + case AVERROR_BSF_NOT_FOUND: errstr = "Bitstream filter not found"; break; + case AVERROR_STREAM_NOT_FOUND: errstr = "Stream not found"; break; } if (errstr) { diff --git a/libavutil/error.h b/libavutil/error.h index 28fa925793..290487f3d9 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -57,6 +57,15 @@ #define AVERROR_NUMEXPECTED (-MKTAG('N','U','E','X')) ///< Number syntax expected in filename #endif +#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 +#define AVERROR_DECODER_NOT_FOUND (-MKTAG(0xF8,'D','E','C')) ///< Decoder not found +#define AVERROR_ENCODER_NOT_FOUND (-MKTAG(0xF8,'E','N','C')) ///< Encoder not found +#define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found +#define AVERROR_FILTER_NOT_FOUND (-MKTAG(0xF8,'F','I','L')) ///< Filter not found +#define AVERROR_BSF_NOT_FOUND (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found +#define AVERROR_STREAM_NOT_FOUND (-MKTAG(0xF8,'S','T','R')) ///< Stream not found + /** * Put a description of the AVERROR code errnum in errbuf. * In case of failure the global variable errno is set to indicate the |