diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
| commit | e3a91c51f7136c1bfd96f71b177b693e08427880 (patch) | |
| tree | a9ceea95293f4622d5934672ac0004f43972833c /libavutil | |
| parent | c3778df2d4c05e76d28d77a2d740e435393046c9 (diff) | |
| parent | c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4 (diff) | |
Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'
* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
rtpdec: Don't pass a non-AVClass pointer as log context
rtsp: Update a comment to the current filename scheme
avcodec: handle AVERROR_EXPERIMENTAL
avutil: Add AVERROR_EXPERIMENTAL
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavformat/rtpdec.c
libavutil/error.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/error.c | 1 | ||||
| -rw-r--r-- | libavutil/error.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libavutil/error.c b/libavutil/error.c index f49d214779..bd66354df2 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -47,6 +47,7 @@ static const struct error_entry error_entries[] = { { ERROR_TAG(PROTOCOL_NOT_FOUND), "Protocol not found" }, { ERROR_TAG(STREAM_NOT_FOUND), "Stream not found" }, { ERROR_TAG(UNKNOWN), "Unknown error occurred" }, + { ERROR_TAG(EXPERIMENTAL), "Experimental feature" }, }; int av_strerror(int errnum, char *errbuf, size_t errbuf_size) diff --git a/libavutil/error.h b/libavutil/error.h index 17681674ce..f3fd7bbff6 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -61,14 +61,15 @@ #define AVERROR_OPTION_NOT_FOUND FFERRTAG(0xF8,'O','P','T') ///< Option not found #define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome #define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found -#define AVERROR_STREAM_NOT_FOUND FFERRTAG(0xF8,'S','T','R') ///< Stream not found +#define AVERROR_STREAM_NOT_FOUND FFERRTAG(0xF8,'S','T','R') ///< Stream not found /** * This is semantically identical to AVERROR_BUG * it has been introduced in Libav after our AVERROR_BUG and with a modified value. */ #define AVERROR_BUG2 FFERRTAG( 'B','U','G',' ') #define AVERROR_UNKNOWN FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library +#define AVERROR_EXPERIMENTAL (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it. #define AV_ERROR_MAX_STRING_SIZE 64 diff --git a/libavutil/version.h b/libavutil/version.h index edbf8f759a..328034207f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,8 +75,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 76 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 77 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |