diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2010-05-26 10:38:48 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-05-26 10:38:48 +0000 |
| commit | 93ebfeea90be8cc270226ac4d282efffed7ca0c7 (patch) | |
| tree | 2749a18714170dae450c4e652c4e1f9bab22d898 | |
| parent | 1ed87f800f6c25ada8d1d98e2e6affbd5909503e (diff) | |
| download | ffmpeg-93ebfeea90be8cc270226ac4d282efffed7ca0c7.tar.gz | |
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
Patch by Janne Grunau, janne-ffmpeg jannau net
Originally committed as revision 23334 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/utils.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 239f605b65..9cb101d46e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -645,6 +645,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 56d4dbd1dd..54db3daec0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -725,14 +725,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) |