summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-21 20:39:40 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-21 20:39:40 +0000
commitb4b5c5c02dd52904b0d9563d49733d1f15c7c836 (patch)
treef2971254bd7113f32b33d33ee8921324496dedb6 /libmpcodecs
parent41a234c631efe0589ea2e4d8a913fc16d6e240a0 (diff)
downloadmpv-b4b5c5c02dd52904b0d9563d49733d1f15c7c836.tar.bz2
mpv-b4b5c5c02dd52904b0d9563d49733d1f15c7c836.tar.xz
1l (%d->%f), cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8511 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_ffmpeg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 02231aa2b7..f90ab2a4bf 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -336,9 +336,10 @@ static int init_vo(sh_video_t *sh){
avctx->height != sh->disp_h ||
!ctx->vo_inited)
{
- mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "aspect_ratio: %d\n", avctx->aspect_ratio);
- sh->aspect =
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", avctx->aspect_ratio);
ctx->last_aspect = avctx->aspect_ratio;
+// if(ctx->last_aspect>=0.01 && ctx->last_aspect<100)
+ sh->aspect = ctx->last_aspect;
sh->disp_w = avctx->width;
sh->disp_h = avctx->height;
ctx->vo_inited=1;
@@ -346,7 +347,7 @@ static int init_vo(sh_video_t *sh){
case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1
case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs
case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv
- case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //???
+ case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg
case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv