diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-17 13:07:15 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-17 13:07:15 +0000 |
commit | f060263337a157d3295e2a1e038a4fb2b245b04f (patch) | |
tree | f54a3171ce6cbcd12620b1d5333150602306f921 /libmpdemux/demux_ogg.c | |
parent | ea59198921e1ebf683cb9e317f198d88cab4e548 (diff) | |
download | mpv-f060263337a157d3295e2a1e038a4fb2b245b04f.tar.bz2 mpv-f060263337a157d3295e2a1e038a4fb2b245b04f.tar.xz |
Reuse AV_RL macros in ogg demuxer instead of its own overcomplicated implementations of it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23330 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
-rw-r--r-- | libmpdemux/demux_ogg.c | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 82fed62e67..5f6971407e 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -13,6 +13,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" +#include "libavutil/intreadwrite.h" #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') @@ -159,55 +160,9 @@ static subtitle ogg_sub; extern subtitle* vo_sub; //FILE* subout; -static -uint16_t get_uint16 (const void *buf) -{ - uint16_t ret; - unsigned char *tmp; - - tmp = (unsigned char *) buf; - - ret = tmp[1] & 0xff; - ret = (ret << 8) + (tmp[0] & 0xff); - - return (ret); -} - -static -uint32_t get_uint32 (const void *buf) -{ - uint32_t ret; - unsigned char *tmp; - - tmp = (unsigned char *) buf; - - ret = tmp[3] & 0xff; - ret = (ret << 8) + (tmp[2] & 0xff); - ret = (ret << 8) + (tmp[1] & 0xff); - ret = (ret << 8) + (tmp[0] & 0xff); - - return (ret); -} - -static -uint64_t get_uint64 (const void *buf) -{ - uint64_t ret; - unsigned char *tmp; - - tmp = (unsigned char *) buf; - - ret = tmp[7] & 0xff; - ret = (ret << 8) + (tmp[6] & 0xff); - ret = (ret << 8) + (tmp[5] & 0xff); - ret = (ret << 8) + (tmp[4] & 0xff); - ret = (ret << 8) + (tmp[3] & 0xff); - ret = (ret << 8) + (tmp[2] & 0xff); - ret = (ret << 8) + (tmp[1] & 0xff); - ret = (ret << 8) + (tmp[0] & 0xff); - - return (ret); -} +#define get_uint16(b) AV_RL16(b) +#define get_uint32(b) AV_RL32(b) +#define get_uint64(b) AV_RL64(b) void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { int lcv; |