diff options
| author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
| commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
| tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libmpcodecs/vf_dlopen.c | |
| parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
| parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
| download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libmpcodecs/vf_dlopen.c')
| -rw-r--r-- | libmpcodecs/vf_dlopen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vf_dlopen.c b/libmpcodecs/vf_dlopen.c index 71da4f1636..183b31be84 100644 --- a/libmpcodecs/vf_dlopen.c +++ b/libmpcodecs/vf_dlopen.c @@ -281,7 +281,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) static int query_format(struct vf_instance *vf, unsigned int fmt) { - if (IMGFMT_IS_HWACCEL(fmt) || fmt == IMGFMT_MJPEG || fmt == IMGFMT_MPEGPES) + if (IMGFMT_IS_HWACCEL(fmt)) return 0; // these can't really be filtered if (fmt == IMGFMT_RGB8 || fmt == IMGFMT_BGR8) return 0; // we don't have palette support, sorry |