diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-16 23:42:44 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-16 23:42:44 +0000 |
| commit | 08400331dcf475cc4ef986e4a08ba1597725ebdc (patch) | |
| tree | bbf21ac47c74a34f0a8b49c9193f7073dd66d90d /libmpcodecs | |
| parent | bf0939eb086ec42e08e73159d08525cfad531c93 (diff) | |
| download | mpv-08400331dcf475cc4ef986e4a08ba1597725ebdc.tar.bz2 mpv-08400331dcf475cc4ef986e4a08ba1597725ebdc.tar.xz | |
fallback to slices, if dr1 fails (bug found by kabi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6743 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index e63ff020cb..78fd541e26 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -311,7 +311,8 @@ static void get_buffer(struct AVCodecContext *avctx, int width, int height, int flags|=(!avctx->hurry_up && ctx->do_slices) ? MP_IMGFLAG_DRAW_CALLBACK:0; else - flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE; + flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE + | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); #if LIBAVCODEC_BUILD > 4616 if(avctx->has_b_frames){ @@ -345,6 +346,7 @@ 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]); } #endif |