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 | |
| 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')
| -rw-r--r-- | libmpdemux/aac_hdr.c | 5 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 5 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/libmpdemux/aac_hdr.c b/libmpdemux/aac_hdr.c index e9c4f5dcc7..1866288349 100644 --- a/libmpdemux/aac_hdr.c +++ b/libmpdemux/aac_hdr.c @@ -18,10 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <stdlib.h> -#include <inttypes.h> - -#include "config.h" +#include <stdint.h> /// \param srate (out) sample rate /// \param num (out) number of audio frames in this ADTS frame diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 12b04b3e01..e554606d14 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -539,14 +539,15 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ // calculating audio/video bitrate: if(priv->idx_size>0){ // we have index, let's count 'em! + AVIINDEXENTRY *idx = priv->idx; int64_t vsize=0; int64_t asize=0; size_t vsamples=0; size_t asamples=0; int i; for(i=0;i<priv->idx_size;i++){ - int id=avi_stream_id(((AVIINDEXENTRY *)priv->idx)[i].ckid); - int len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength; + int id=avi_stream_id(idx[i].ckid); + unsigned len=idx[i].dwChunkLength; if(sh_video->ds->id == id) { vsize+=len; ++vsamples; 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; } |