diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ve_divx4.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_libdv.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_nuv.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_qtvideo.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_raw.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_vfw.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_xvid.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ve_xvid4.c | 1 |
9 files changed, 11 insertions, 1 deletions
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 4640b1d672..d0549d02ba 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -211,6 +211,7 @@ static int config(struct vf_instance_s* vf, mux_v->bih->biWidth=width; mux_v->bih->biHeight=height; mux_v->bih->biSizeImage=width*height*3; + mux_v->aspect = (float)d_width/d_height; if(!divx4_param.bitrate) divx4_param.bitrate=800000; else if(divx4_param.bitrate<=16000) divx4_param.bitrate*=1000; diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index c3ae0f2c49..538d730b91 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -519,6 +519,7 @@ static int config(struct vf_instance_s* vf, #else lavc_venc_context->aspect_ratio= ratio; #endif + mux_v->aspect = ratio; mp_dbg(MSGT_MENCODER, MSGL_DBG2, "aspect_ratio: %f\n", ratio); } else { mp_dbg(MSGT_MENCODER, MSGL_ERR, "aspect ratio: cannot parse \"%s\"\n", lavc_param_aspect); @@ -529,8 +530,9 @@ static int config(struct vf_instance_s* vf, #if LIBAVCODEC_BUILD >= 4687 lavc_venc_context->sample_aspect_ratio = av_d2q((float)d_width/d_height*height / width, 255); #else - lavc_venc_context->aspect_ratio = (float)d_width/d_height; + lavc_venc_context->aspect_ratio = #endif + mux_v->aspect = (float)d_width/d_height; /* keyframe interval */ if (lavc_param_keyint >= 0) /* != -1 */ diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index 2e0478021e..8b18c2be74 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -55,6 +55,7 @@ static int config(struct vf_instance_s* vf, mux_v->bih->biWidth=width; mux_v->bih->biHeight=height; mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); + mux_v->aspect = (float)d_width/d_height; return 1; } diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index 1cff9e28a2..50a75666e5 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -80,6 +80,7 @@ static int config(struct vf_instance_s* vf, mux_v->bih->biWidth=width; mux_v->bih->biHeight=height; mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); + mux_v->aspect = (float)d_width/d_height; vf->priv->buffer = realloc(vf->priv->buffer,vf->priv->buf_size); vf->priv->tbl_wrote = 0; diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 81d5c6812d..f47095a747 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -129,6 +129,7 @@ static int config(struct vf_instance_s* vf, mux_v->bih->biWidth=width; mux_v->bih->biHeight=height; mux_v->bih->biSizeImage=width*height*2; + mux_v->aspect = (float)d_width/d_height; diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c index ddc93a606f..b9461497d2 100644 --- a/libmpcodecs/ve_raw.c +++ b/libmpcodecs/ve_raw.c @@ -83,6 +83,7 @@ static int config(struct vf_instance_s *vf, int ret; mux_v->bih->biWidth = width; mux_v->bih->biHeight = height; + mux_v->aspect = (float)d_width/d_height; ret = set_format(vf, outfmt); if (!ret) return 0; diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 61aad0cd8f..7241dd1dca 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -217,6 +217,7 @@ static int config(struct vf_instance_s* vf, vfw_bih->biWidth=width; vfw_bih->biHeight=height; vfw_bih->biSizeImage=width*height*((vfw_bih->biBitCount+7)/8); + mux_v->aspect = (float)d_width/d_height; if(!vfw_start_encoder(vfw_bih, mux_v->bih)) return 0; diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 2beab7e43f..ceedf07dc6 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -172,6 +172,7 @@ config(struct vf_instance_s* vf, fp->mux->bih->biWidth = width; fp->mux->bih->biHeight = height; fp->mux->bih->biSizeImage = fp->mux->bih->biWidth * fp->mux->bih->biHeight * 3; + fp->mux->aspect = (float)d_width/d_height; mp_msg(MSGT_MENCODER,MSGL_INFO,"videocodec: XViD (%dx%d fourcc=%x [%.4s])\n", width, height, fp->mux->bih->biCompression, (char *)&fp->mux->bih->biCompression); diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index 137fa207af..850373c9b6 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -339,6 +339,7 @@ config(struct vf_instance_s* vf, mod->mux->bih->biHeight = height; mod->mux->bih->biSizeImage = mod->mux->bih->biWidth * mod->mux->bih->biHeight * 3; + mod->mux->aspect = (float)d_width/d_height; /* Message the FourCC type */ mp_msg(MSGT_MENCODER, MSGL_INFO, |