diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-18 02:49:34 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-18 02:49:34 +0400 |
| commit | fecd7b457e5908f2758bda78753c851159cad91a (patch) | |
| tree | 86dfe21af0a1fe65c13ee036ecd74d034c7cc3a4 | |
| parent | 1095d4425865777a98b510d7af0816e093c6db23 (diff) | |
Add log_level_offset to AVCodecContext.
Originally committed as revision 23153 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/options.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 417a8468b7..5a570fd001 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,7 +31,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 67 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -2656,6 +2656,8 @@ typedef struct AVCodecContext { * - decoding: unused */ float crf_max; + + int log_level_offset; } AVCodecContext; /** diff --git a/libavcodec/options.c b/libavcodec/options.c index 3b50d2c689..2655bb0ecb 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -413,6 +413,7 @@ static const AVOption options[]={ {"ssim", "ssim will be calculated during encoding", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SSIM, INT_MIN, INT_MAX, V|E, "flags2"}, {"intra_refresh", "use periodic insertion of intra blocks instead of keyframes", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_INTRA_REFRESH, INT_MIN, INT_MAX, V|E, "flags2"}, {"crf_max", "in crf mode, prevents vbv from lowering quality beyond this point", OFFSET(crf_max), FF_OPT_TYPE_FLOAT, DEFAULT, 0, 51, V|E}, +{"log_level_offset", "set the log level offset", OFFSET(log_level_offset), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX }, {NULL}, }; @@ -423,7 +424,7 @@ static const AVOption options[]={ #undef D #undef DEFAULT -static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options, LIBAVUTIL_VERSION_INT }; +static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options, LIBAVUTIL_VERSION_INT, OFFSET(log_level_offset) }; void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){ int flags=0; |