diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-21 13:36:12 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-04-21 16:48:29 +0200 |
| commit | 8d67218bd73744c367450d8b8ecc5a6e6c42bd11 (patch) | |
| tree | 660cf14851087f5a25537b1de972258f435a367b /libavutil | |
| parent | ab1adff73f4852d99f9c65ef5a5ceca3e2accbe8 (diff) | |
| download | ffmpeg-8d67218bd73744c367450d8b8ecc5a6e6c42bd11.tar.gz | |
error: sort, pack, and align error code and string definitions
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/error.c | 24 | ||||
| -rw-r--r-- | libavutil/error.h | 20 |
2 files changed, 20 insertions, 24 deletions
diff --git a/libavutil/error.c b/libavutil/error.c index 252007a6c9..ddcc038650 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -25,19 +25,19 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size) const char *errstr = NULL; switch (errnum) { - case AVERROR_EOF: errstr = "End of file"; break; - case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input"; break; + case AVERROR_BSF_NOT_FOUND: errstr = "Bitstream filter not found" ; break; + case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found" ; break; + case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found" ; break; + case AVERROR_ENCODER_NOT_FOUND: errstr = "Encoder not found" ; break; + case AVERROR_EOF: errstr = "End of file" ; break; + case AVERROR_EXIT: errstr = "Immediate exit requested" ; break; + case AVERROR_FILTER_NOT_FOUND: errstr = "Filter not found" ; break; + case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input" ; break; + case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found" ; break; + case AVERROR_OPTION_NOT_FOUND: errstr = "Option not found" ; 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; - case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break; - case AVERROR_ENCODER_NOT_FOUND: errstr = "Encoder not found"; break; - case AVERROR_OPTION_NOT_FOUND: errstr = "Option 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; - case AVERROR_EXIT: errstr = "Immediate exit requested"; break; + case AVERROR_PROTOCOL_NOT_FOUND:errstr = "Protocol 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 a422f8555c..ba12d2bfae 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -37,24 +37,20 @@ #define AVUNERROR(e) (e) #endif -#define AVERROR_EOF (-MKTAG('E','O','F',' ')) ///< End of file - -#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_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_BSF_NOT_FOUND (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found #define AVERROR_DECODER_NOT_FOUND (-MKTAG(0xF8,'D','E','C')) ///< Decoder not found +#define AVERROR_DEMUXER_NOT_FOUND (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found #define AVERROR_ENCODER_NOT_FOUND (-MKTAG(0xF8,'E','N','C')) ///< Encoder not found +#define AVERROR_EOF (-MKTAG( 'E','O','F',' ')) ///< End of file +#define AVERROR_EXIT (-MKTAG( 'E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted +#define AVERROR_FILTER_NOT_FOUND (-MKTAG(0xF8,'F','I','L')) ///< Filter not found +#define AVERROR_INVALIDDATA (-MKTAG( 'I','N','D','A')) ///< Invalid data found when processing input +#define AVERROR_MUXER_NOT_FOUND (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found #define AVERROR_OPTION_NOT_FOUND (-MKTAG(0xF8,'O','P','T')) ///< Option not found +#define AVERROR_PATCHWELCOME (-MKTAG( 'P','A','W','E')) ///< Not yet implemented in Libav, patches welcome #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 -#define AVERROR_EXIT (-MKTAG('E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted - /** * Put a description of the AVERROR code errnum in errbuf. * In case of failure the global variable errno is set to indicate the |