diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /libmpdemux/demuxer.h | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 6aaa7c8b79..a5b67779ab 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -407,13 +407,9 @@ void ds_clear_parser(demux_stream_t *sh); stream_t* new_ds_stream(demux_stream_t *ds); static inline int avi_stream_id(unsigned int id){ - unsigned char *p=(unsigned char *)&id; unsigned char a,b; -#if HAVE_BIGENDIAN - a=p[3]-'0'; b=p[2]-'0'; -#else - a=p[0]-'0'; b=p[1]-'0'; -#endif + a = id - '0'; + b = (id >> 8) - '0'; if(a>9 || b>9) return 100; // invalid ID return a*10+b; } |