diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-25 16:29:53 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-25 16:29:53 +0000 |
| commit | 8da4f67d7658ecd9515c745ccbfd18629a74f1ef (patch) | |
| tree | 9070dd2b03ce401f777ff3944bd22234b356ad17 /libmpcodecs | |
| parent | 3c9ef55e0a4103a8c27388727f0741cf2905dfe6 (diff) | |
| download | mpv-8da4f67d7658ecd9515c745ccbfd18629a74f1ef.tar.bz2 mpv-8da4f67d7658ecd9515c745ccbfd18629a74f1ef.tar.xz | |
quicktime fix update
- check for existence of sh->ImageDesc instead of h263 fourcc
- honor -lavdopts lowres
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15570 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index edc4730a79..baa0c0c959 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -471,9 +471,13 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ width = avctx->width; height = avctx->height; - if (sh->bih && sh->format == mmioFOURCC('h','2','6','3')) { - width = sh->bih->biWidth; - height = sh->bih->biHeight; + + // HACK! + // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. + // use dimensions from BIH to avoid black borders at the right and bottom. + if (sh->bih && sh->ImageDesc) { + width = sh->bih->biWidth>>lavc_param_lowres; + height = sh->bih->biHeight>>lavc_param_lowres; } // it is possible another vo buffers to be used after vo config() |