aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2010-05-29 14:33:02 +0000
committerReinhard Tartler <siretart@tauware.de>2010-05-29 14:33:02 +0000
commit3fa19f68287be4fc06776a4a52a7415e47822876 (patch)
tree508932d8e9323e128fb89a617d67a157a76536aa /libavcodec/avcodec.h
parent4e62a6738972275ab4cda625304f1cd25d8a0772 (diff)
downloadffmpeg-3fa19f68287be4fc06776a4a52a7415e47822876.tar.gz
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
Patch by Janne Grunau, janne-ffmpeg jannau net backport r23334,23337-23338 by cehoyos and stefano Originally committed as revision 23379 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 996bc15b70..8832014a72 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 69
+#define LIBAVCODEC_VERSION_MINOR 72
#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -644,6 +644,11 @@ typedef struct RcOverride{
* as a last resort.
*/
#define CODEC_CAP_SUBFRAMES 0x0100
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL 0x0200
//The following defines may change, don't expect compatibility if you use them.
#define MB_TYPE_INTRA4x4 0x0001