diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-27 11:31:53 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-27 11:31:53 +0000 |
| commit | a5f69284d90323fc865e18033b6a22c11707fe20 (patch) | |
| tree | 52b9ce98a17af66fa09a3d0bc8a55db1ed77fde5 /libmpcodecs | |
| parent | b5ddaf20bae3d5d86951256502702910e44de207 (diff) | |
| download | mpv-a5f69284d90323fc865e18033b6a22c11707fe20.tar.bz2 mpv-a5f69284d90323fc865e18033b6a22c11707fe20.tar.xz | |
handle the lavfpref demuxer in the same way as the lavf one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 43ac33729b..e082d2a5a0 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -755,7 +755,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ avctx->hurry_up=(flags&3)?((flags&2)?2:1):0; - if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF) + if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF && + sh->ds->demuxer->type != DEMUXER_TYPE_LAVF_PREFERRED) if( sh->format == mmioFOURCC('R', 'V', '1', '0') || sh->format == mmioFOURCC('R', 'V', '1', '3') || sh->format == mmioFOURCC('R', 'V', '2', '0') |