diff options
| author |  alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 20:45:58 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 20:45:58 +0000 |
| commit | 5c2cb7a85158f39eb3aa0c0b3a8bdbd387373fd6 (patch) | |
| tree | 2af5880dd9994342106fa092b516f1ae903ae5e9 | |
| parent | c8c592dd9978e3a4c854994574b51b005a8d1861 (diff) | |
extended par support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7389 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 7faedf8ed6..ffdbc2dbd3 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -17,8 +17,8 @@ static vd_info_t info = { "FFmpeg's libavcodec codec family", "ffmpeg", "A'rpi", - "http://ffmpeg.sf.net", - "native codecs" + "A'rpi, Michael, Alex", + "native codecs (http://ffmpeg.sf.net/)" }; LIBVD_EXTERN(ffmpeg) @@ -273,6 +273,11 @@ static int init_vo(sh_video_t *sh){ 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); +#endif ctx->last_aspect = avctx->aspect_ratio_info; switch(avctx->aspect_ratio_info) { @@ -287,6 +292,12 @@ static int init_vo(sh_video_t *sh){ 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; |