diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c | |
parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c | 105 |
1 files changed, 50 insertions, 55 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c index d03286e40..ae6ee4785 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/options.c @@ -26,9 +26,8 @@ #include "avcodec.h"
-static const char* context_to_name(void* ptr)
-{
- AVCodecContext *avc = ptr;
+static const char* context_to_name(void* ptr) {
+ AVCodecContext *avc= ptr;
if(avc && avc->codec && avc->codec->name)
return avc->codec->name;
@@ -38,63 +37,60 @@ static const char* context_to_name(void* ptr) static AVClass av_codec_context_class = { "AVCodecContext", context_to_name };
-void avcodec_get_context_defaults(AVCodecContext *s)
-{
+void avcodec_get_context_defaults(AVCodecContext *s){
memset(s, 0, sizeof(AVCodecContext));
- s->av_class = &av_codec_context_class;
+ s->av_class= &av_codec_context_class;
- s->time_base.num = 0;
- s->time_base.den = 1;
+ s->time_base.num=0; s->time_base.den=1;
- s->get_buffer = avcodec_default_get_buffer;
- s->release_buffer = avcodec_default_release_buffer;
- s->get_format = avcodec_default_get_format;
- s->execute = avcodec_default_execute;
- s->execute2 = avcodec_default_execute2;
- s->sample_aspect_ratio.num = 0;
- s->sample_aspect_ratio.den = 1;
- s->pix_fmt = PIX_FMT_NONE;
- s->sample_fmt = SAMPLE_FMT_S16; // FIXME: set to NONE
+ s->get_buffer= avcodec_default_get_buffer;
+ s->release_buffer= avcodec_default_release_buffer;
+ s->get_format= avcodec_default_get_format;
+ s->execute= avcodec_default_execute;
+ s->execute2= avcodec_default_execute2;
+ s->sample_aspect_ratio.num=0; s->sample_aspect_ratio.den=1;
+ s->pix_fmt= PIX_FMT_NONE;
+ s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
s->palctrl = NULL;
- s->reget_buffer = avcodec_default_reget_buffer;
-
- s->bit_rate = 800 * 1000;
- s->bit_rate_tolerance = s->bit_rate * 10;
- s->qmin = 2;
- s->qmax = 31;
- s->mb_lmin = FF_QP2LAMBDA * 2;
- s->mb_lmax = FF_QP2LAMBDA * 31;
+ s->reget_buffer= avcodec_default_reget_buffer;
+
+ s->bit_rate= 800*1000;
+ s->bit_rate_tolerance= s->bit_rate*10;
+ s->qmin= 2;
+ s->qmax= 31;
+ s->mb_lmin= FF_QP2LAMBDA * 2;
+ s->mb_lmax= FF_QP2LAMBDA * 31;
s->cqp = -1;
s->refs = 1;
s->directpred = 2;
- s->qcompress = 0.5;
+ s->qcompress= 0.5;
s->complexityblur = 20.0;
s->keyint_min = 25;
s->flags2 = CODEC_FLAG2_FASTPSKIP;
- s->max_qdiff = 3;
- s->b_quant_factor = 1.25;
- s->b_quant_offset = 1.25;
- s->i_quant_factor = -0.8;
- s->i_quant_offset = 0.0;
- s->error_concealment = 3;
- s->error_recognition = 1;
- s->workaround_bugs = FF_BUG_AUTODETECT;
- s->gop_size = 50;
- s->me_method = ME_EPZS;
- s->thread_count = 1;
- s->me_subpel_quality = 8;
- s->lmin = FF_QP2LAMBDA * s->qmin;
- s->lmax = FF_QP2LAMBDA * s->qmax;
- s->ildct_cmp = FF_CMP_VSAD;
- s->profile = FF_PROFILE_UNKNOWN;
- s->level = FF_LEVEL_UNKNOWN;
- s->me_penalty_compensation = 256;
- s->frame_skip_cmp = FF_CMP_DCTMAX;
- s->nsse_weight = 8;
- s->mv0_threshold = 256;
- s->b_sensitivity = 40;
+ s->max_qdiff= 3;
+ s->b_quant_factor=1.25;
+ s->b_quant_offset=1.25;
+ s->i_quant_factor=-0.8;
+ s->i_quant_offset=0.0;
+ s->error_concealment= 3;
+ s->error_recognition= 1;
+ s->workaround_bugs= FF_BUG_AUTODETECT;
+ s->gop_size= 50;
+ s->me_method= ME_EPZS;
+ s->thread_count=1;
+ s->me_subpel_quality=8;
+ s->lmin= FF_QP2LAMBDA * s->qmin;
+ s->lmax= FF_QP2LAMBDA * s->qmax;
+ s->ildct_cmp= FF_CMP_VSAD;
+ s->profile= FF_PROFILE_UNKNOWN;
+ s->level= FF_LEVEL_UNKNOWN;
+ s->me_penalty_compensation= 256;
+ s->frame_skip_cmp= FF_CMP_DCTMAX;
+ s->nsse_weight= 8;
+ s->mv0_threshold= 256;
+ s->b_sensitivity= 40;
s->compression_level = FF_COMPRESSION_DEFAULT;
s->use_lpc = -1;
s->min_prediction_order = -1;
@@ -102,17 +98,16 @@ void avcodec_get_context_defaults(AVCodecContext *s) s->prediction_order_method = -1;
s->min_partition_order = -1;
s->max_partition_order = -1;
- s->intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
- s->inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
- s->rc_max_available_vbv_use = 1.0 / 3;
+ s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
+ s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
+ s->rc_max_available_vbv_use = 1.0/3;
s->rc_min_vbv_overflow_use = 3;
}
-AVCodecContext *avcodec_alloc_context(void)
-{
- AVCodecContext *avctx = av_malloc(sizeof(AVCodecContext));
+AVCodecContext *avcodec_alloc_context(void){
+ AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
- if(avctx == NULL) return NULL;
+ if(avctx==NULL) return NULL;
avcodec_get_context_defaults(avctx);
|