diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-02 12:19:21 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-02 12:19:21 +0000 |
| commit | f3bbcd811eb5b8dfe287b5e5fe239876a0808cf0 (patch) | |
| tree | 8050f94033b5b50800dcb8f69da8727c8c7f66a2 /libmpcodecs | |
| parent | 0e4cf781e648f3dbb5a8b96b6be72d039241b3c6 (diff) | |
| download | mpv-f3bbcd811eb5b8dfe287b5e5fe239876a0808cf0.tar.bz2 mpv-f3bbcd811eb5b8dfe287b5e5fe239876a0808cf0.tar.xz | |
compatibility with _OLD_ lavc & uv_stride check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6870 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 748c1ac6d3..2ab464b309 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -73,7 +73,7 @@ struct config lavc_decode_opts_conf[]={ #if LIBAVCODEC_BUILD >= 4614 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, #endif - {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, + {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -224,8 +224,8 @@ static void draw_slice(struct AVCodecContext *s, int stride[3]; int start=0, i; int skip_stride= (s->width+15)>>4; - UINT8 *skip= &s->mbskip_table[(y>>4)*skip_stride]; #if LIBAVCODEC_BUILD > 4615 + UINT8 *skip= &s->mbskip_table[(y>>4)*skip_stride]; int threshold= s->pict_type==B_TYPE ? -99 : s->dr_ip_buffer_count; #endif @@ -346,6 +346,10 @@ static void get_buffer(struct AVCodecContext *avctx, int width, int height, int if(avctx->dr_stride && avctx->dr_stride !=mpi->stride[0]){ mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: stride changed\n"); } + + if(avctx->dr_uvstride && avctx->dr_uvstride !=mpi->stride[1]){ + mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: uvstride changed\n"); + } avctx->dr_stride = mpi->stride[0]; avctx->dr_uvstride = mpi->stride[1]; @@ -353,6 +357,14 @@ static void get_buffer(struct AVCodecContext *avctx, int width, int height, int avctx->dr_opaque_frame = mpi; avctx->dr_ip_buffer_count=2; //FIXME //printf("%X\n", (int)mpi->planes[0]); +#if 0 +if(mpi->flags&MP_IMGFLAG_DIRECT) + printf("D"); +else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) + printf("S"); +else + printf("."); +#endif } #endif |