aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-12-03 11:21:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-03 15:18:58 +0100
commit976b0959391cefb4cd72d66d392def843a3a9857 (patch)
tree99874e5178003a3ff16e7c7747ec1ee5df4a80a0
parent757cb3b46a5ae81c169a83975dc25040e7864475 (diff)
downloadffmpeg-976b0959391cefb4cd72d66d392def843a3a9857.tar.gz
lavu/error: define AVERROR_BUG.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/APIchanges3
-rw-r--r--libavutil/avutil.h4
-rw-r--r--libavutil/error.c1
-rw-r--r--libavutil/error.h1
4 files changed, 7 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 23e568922c..6f7d46df9e 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first:
+2011-12-03 - xxxxxxx - lavu 51.30.0
+ Add AVERROR_BUG.
+
2011-xx-xx - xxxxxxx - lavu 51.28.1
Add av_get_alt_sample_fmt() to samplefmt.h.
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 85c7dbd063..af43cc5e8f 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -153,8 +153,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 29
-#define LIBAVUTIL_VERSION_MICRO 1
+#define LIBAVUTIL_VERSION_MINOR 30
+#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
diff --git a/libavutil/error.c b/libavutil/error.c
index d296395c09..4220aa6da6 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -27,6 +27,7 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
switch (errnum) {
case AVERROR_BSF_NOT_FOUND: errstr = "Bitstream filter not found" ; break;
+ case AVERROR_BUG: errstr = "Internal bug, should not have happened" ; 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;
diff --git a/libavutil/error.h b/libavutil/error.h
index fa18afcdf1..d3c1465756 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -45,6 +45,7 @@
#endif
#define AVERROR_BSF_NOT_FOUND (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found
+#define AVERROR_BUG (-MKTAG( 'B','U','G','!')) ///< Internal bug
#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