diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-08 02:05:14 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-08 02:05:14 +0000 |
| commit | ce6c56af7ba6e9b0faa781736d7f4ea097aa26ff (patch) | |
| tree | 32b55cfe34c77943ee75fe97b413b47df20b9da7 | |
| parent | 90eb7beed5f021b94df5827a9636ddeb09da8286 (diff) | |
| download | mpv-ce6c56af7ba6e9b0faa781736d7f4ea097aa26ff.tar.bz2 mpv-ce6c56af7ba6e9b0faa781736d7f4ea097aa26ff.tar.xz | |
merging fourcc with codec_tag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9548 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 573a9032ec..481026d38c 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -67,7 +67,7 @@ static int init(sh_audio_t *sh_audio) lavc_context->bit_rate = sh_audio->wf->nAvgBytesPerSec * 8; lavc_context->block_align = sh_audio->wf->nBlockAlign; } - lavc_context->fourcc = sh_audio->format; + lavc_context->codec_tag = sh_audio->format; //FOURCC lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi /* alloc extra data */ diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 64e96f6ff8..a14c4cd1b6 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -90,7 +90,7 @@ static int lavc_param_idct_algo=0; static int lavc_param_debug=0; struct config lavc_decode_opts_conf[]={ - {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL}, + {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, @@ -186,7 +186,7 @@ static int init(sh_video_t *sh){ avctx->workaround_bugs= lavc_param_workaround_bugs; avctx->error_resilience= lavc_param_error_resilience; if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; - avctx->fourcc= sh->format; + avctx->codec_tag= sh->format; avctx->idct_algo= lavc_param_idct_algo; avctx->error_concealment= lavc_param_error_concealment; #if LIBAVCODEC_BUILD >= 4642 @@ -540,7 +540,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ ret = avcodec_decode_video(avctx, pic, &got_picture, data, len); if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n"); - +//printf("repeat: %d\n", pic->repeat_pict); //-- vstats generation #if LIBAVCODEC_BUILD >= 4643 while(lavc_param_vstats){ // always one time loop |