diff options
author | wm4 <wm4@nowhere> | 2014-09-25 19:58:22 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-25 21:32:55 +0200 |
commit | debbff76f9b97f77ffa6249e92d2573548a99a40 (patch) | |
tree | 0f2e438ed0b66ed85cb346770c2f343be2b68a83 /stream | |
parent | 09b7956ca596a876f19273568c7756f675b2b56e (diff) | |
download | mpv-debbff76f9b97f77ffa6249e92d2573548a99a40.tar.bz2 mpv-debbff76f9b97f77ffa6249e92d2573548a99a40.tar.xz |
Remove mpbswap.h
This was once central, but now it's almost unused. Only vf_divtc still
uses it for extremely weird and incomprehensible reasons. The use in
stream.c is trivial. Replace these, and remove mpbswap.h.
Diffstat (limited to 'stream')
-rw-r--r-- | stream/stream.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream.c b/stream/stream.c index 7d8dc7d64d..ae4335c8b7 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -31,7 +31,6 @@ #include <assert.h> #include <libavutil/common.h> -#include "osdep/mpbswap.h" #include "osdep/atomics.h" #include "talloc.h" @@ -860,7 +859,7 @@ static uint16_t stream_read_word_endian(stream_t *s, bool big_endian) unsigned int y = stream_read_char(s); y = (y << 8) | stream_read_char(s); if (big_endian) - y = bswap_16(y); + y = (y >> 8) | ((y << 8) & 0xFF); return y; } |