diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-27 10:08:57 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-27 10:08:57 +0000 |
| commit | c65ac515d87f9e3a06693f0681e5ba17a940619f (patch) | |
| tree | 1cf0ed037d01b56e9e9178a1c4b8366a14c7813b /libmpcodecs | |
| parent | d98703fa21aad129d6dfaa3953c16fac208615c8 (diff) | |
| download | mpv-c65ac515d87f9e3a06693f0681e5ba17a940619f.tar.bz2 mpv-c65ac515d87f9e3a06693f0681e5ba17a940619f.tar.xz | |
compensate for width/height being picture width/height instead of bitstream width/height
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13490 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1b4fb497d3..6526823285 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -414,7 +414,7 @@ static void draw_slice(struct AVCodecContext *s, sh_video_t * sh = s->opaque; int start=0, i; int width= s->width; - int skip_stride= (width+15)>>4; + int skip_stride= ((width<<lavc_param_lowres)+15)>>4; uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride]; int threshold= s->coded_frame->age; #if LIBAVCODEC_BUILD >= 4670 @@ -787,8 +787,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ // average MB quantizer { int x, y; - int w = (avctx->width+15) >> 4; - int h = (avctx->height+15) >> 4; + int w = ((avctx->width << lavc_param_lowres)+15) >> 4; + int h = ((avctx->height << lavc_param_lowres)+15) >> 4; int8_t *q = pic->qscale_table; for( y = 0; y < h; y++ ) { for( x = 0; x < w; x++ ) |