diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2010-05-29 14:33:02 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-05-29 14:33:02 +0000 |
| commit | 3fa19f68287be4fc06776a4a52a7415e47822876 (patch) | |
| tree | 508932d8e9323e128fb89a617d67a157a76536aa | |
| parent | 4e62a6738972275ab4cda625304f1cd25d8a0772 (diff) | |
| download | ffmpeg-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
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/utils.c | 12 |
4 files changed, 18 insertions, 5 deletions
@@ -79,6 +79,7 @@ version 0.6: - low overhead Ogg muxing - WebM support in Matroska demuxer - VP8 decoding via libvpx +- CODEC_CAP_EXPERIMENTAL added diff --git a/doc/APIchanges b/doc/APIchanges index d521b59e29..4d574108b8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -12,6 +12,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-05-26 - r23334 - lavc 52.72.0 - CODEC_CAP_EXPERIMENTAL + Add CODEC_CAP_EXPERIMENTAL flag. + 2010-05-18 - r23161 - lavf 52.63.0 - AVFMT_FLAG_RTP_HINT Add AVFMT_FLAG_RTP_HINT as possible value for AVFormatContext.flags 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 diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 87facec8f4..014427d59f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -724,14 +724,18 @@ av_cold int avcodec_close(AVCodecContext *avctx) AVCodec *avcodec_find_encoder(enum CodecID id) { - AVCodec *p; + AVCodec *p, *experimental=NULL; p = first_avcodec; while (p) { - if (p->encode != NULL && p->id == id) - return p; + if (p->encode != NULL && p->id == id) { + if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { + experimental = p; + } else + return p; + } p = p->next; } - return NULL; + return experimental; } AVCodec *avcodec_find_encoder_by_name(const char *name) |