summaryrefslogtreecommitdiff
path: root/libavutil/error.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-22 14:39:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-22 14:39:12 +0200
commite3a91c51f7136c1bfd96f71b177b693e08427880 (patch)
treea9ceea95293f4622d5934672ac0004f43972833c /libavutil/error.h
parentc3778df2d4c05e76d28d77a2d740e435393046c9 (diff)
parentc3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4 (diff)
downloadffmpeg-e3a91c51f7136c1bfd96f71b177b693e08427880.tar.gz
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/error.h')
-rw-r--r--libavutil/error.h3
1 files changed, 2 insertions, 1 deletions
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