diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
| commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
| tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /libmpcodecs/vd_ffmpeg.c | |
| parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
| parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
| download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz | |
Merge svn changes up to r27514
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -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 be3012a795..78e705318d 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -740,7 +740,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') |