diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:53:08 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:56:10 +0200 |
| commit | d46b86bc7c39082b26ec71aa16431f3275d836ff (patch) | |
| tree | 035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /libmpcodecs/vd_vfw.c | |
| parent | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff) | |
| parent | 3e8f2815c19703f5cb6f75db2910234d499d9676 (diff) | |
| download | mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2 mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz | |
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'libmpcodecs/vd_vfw.c')
| -rw-r--r-- | libmpcodecs/vd_vfw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 197ead6bae..99b1cbeeb8 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -333,7 +333,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if (priv->palette) { mpi->planes[1] = priv->palette; - mpi->flags |= MP_IMGFLAG_RGB_PALETTE; mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "Found and copied palette\n"); } else |