diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-20 13:16:09 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-20 13:16:09 +0000 |
commit | 899bf1b58ebf96b9840f3a222b19c9b17ab547d7 (patch) | |
tree | cedfa75ccd6505df8b77f7ee4661599b484a9ce8 /libmpcodecs/vd_ffmpeg.c | |
parent | 7a5657ff93cd3aafce1b72f6f88e0693e4af2c9c (diff) | |
download | mpv-899bf1b58ebf96b9840f3a222b19c9b17ab547d7.tar.bz2 mpv-899bf1b58ebf96b9840f3a222b19c9b17ab547d7.tar.xz |
aspect ratio clenaup
& a/b type aspect argument patch from (RĂ©mi Guyomarch <rguyom at pobox dot com>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8238 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 3fded87e6d..24cc61bcc2 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -40,7 +40,7 @@ int quant_store[MBR+1][MBC+1]; typedef struct { AVCodecContext *avctx; - int last_aspect; + float last_aspect; int do_slices; int do_dr1; int vo_inited; @@ -330,37 +330,16 @@ static int init_vo(sh_video_t *sh){ vd_ffmpeg_ctx *ctx = sh->context; AVCodecContext *avctx = ctx->avctx; - if (avctx->aspect_ratio_info != ctx->last_aspect || + if (avctx->aspect_ratio != ctx->last_aspect || avctx->width != sh->disp_w || avctx->height != sh->disp_h || !ctx->vo_inited) { -#if LIBAVCODEC_BUILD >= 4623 - mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "aspect_ratio_info: %d\n", avctx->aspect_ratio_info); - mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "par_width: %f\n", (float)avctx->aspected_width); - mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "par_height: %f\n", (float)avctx->aspected_height); +#if LIBAVCODEC_BUILD >= 4640 + mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "aspect_ratio: %d\n", avctx->aspect_ratio); + sh->aspect = + ctx->last_aspect = avctx->aspect_ratio; #endif - ctx->last_aspect = avctx->aspect_ratio_info; - switch(avctx->aspect_ratio_info) - { - case FF_ASPECT_4_3_625: - case FF_ASPECT_4_3_525: - sh->aspect = 4.0/3.0; - break; - case FF_ASPECT_16_9_625: - case FF_ASPECT_16_9_525: - sh->aspect = 16.0/9.0; - break; - case FF_ASPECT_SQUARE: - sh->aspect = 0.0; - break; -#if LIBAVCODEC_BUILD >= 4623 - case FF_ASPECT_EXTENDED: - if (avctx->aspected_width && avctx->aspected_height) - sh->aspect = (float)avctx->aspected_width/(float)avctx->aspected_height; - break; -#endif - } sh->disp_w = avctx->width; sh->disp_h = avctx->height; ctx->vo_inited=1; |