diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
commit | 1715c2a33632b333f8e8e581ef23ea5fe0234edd (patch) | |
tree | f2f9ddca0f4940edd845d71a5bfd74c8a09ba633 /libvo/vo_png.c | |
parent | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (diff) | |
parent | 409bb1c5daba69aac788ce5065d05b8ea8441cfd (diff) | |
download | mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.bz2 mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.xz |
Merge svn changes up to r27949
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
Diffstat (limited to 'libvo/vo_png.c')
-rw-r--r-- | libvo/vo_png.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 3c5f109aa2..ac0e99587e 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -191,8 +191,8 @@ static int query_format(uint32_t format) { switch(format){ - case IMGFMT_RGB|24: - case IMGFMT_BGR|24: + case IMGFMT_RGB24: + case IMGFMT_BGR24: return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE; } return 0; |