Mercurial > mplayer.hg
changeset 25827:3fc9f549b5d0
remove the spu_set field, replaced by a flag
| author | ben |
|---|---|
| date | Sat, 26 Jan 2008 13:06:42 +0000 |
| parents | d8ed72fc61f8 |
| children | 8a1627f693a6 |
| files | stream/stream_dvdnav.c |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/stream_dvdnav.c Sat Jan 26 12:54:44 2008 +0000 +++ b/stream/stream_dvdnav.c Sat Jan 26 13:06:42 2008 +0000 @@ -29,6 +29,7 @@ NAV_FLAG_WAIT_READ_AUTO = 1 << 4, /* wait read auto mode */ NAV_FLAG_WAIT_READ = 1 << 5, /* suspend read from stream */ NAV_FLAG_VTS_DOMAIN = 1 << 6, /* vts domain */ + NAV_FLAG_SPU_SET = 1 << 7, /* spu_clut is valid */ } dvdnav_state_t; typedef struct { @@ -37,7 +38,7 @@ unsigned int duration; /* in milliseconds */ int mousex, mousey; int title; - unsigned int spu_clut[16], spu_set; + unsigned int spu_clut[16]; dvdnav_highlight_event_t hlev; int still_length; /* still frame duration */ unsigned int state; @@ -219,7 +220,7 @@ } case DVDNAV_SPU_CLUT_CHANGE: { memcpy(priv->spu_clut, buf, 16*sizeof(unsigned int)); - priv->spu_set = 1; + priv->state |= NAV_FLAG_SPU_SET; break; } case DVDNAV_WAIT: { @@ -805,7 +806,7 @@ */ unsigned int *mp_dvdnav_get_spu_clut(stream_t *stream) { dvdnav_priv_t *priv=(dvdnav_priv_t*)stream->priv; - if(!priv->spu_set) return NULL; + if (!(priv->state & NAV_FLAG_SPU_SET)) return NULL; return priv->spu_clut; }