From debbff76f9b97f77ffa6249e92d2573548a99a40 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 25 Sep 2014 19:58:22 +0200
Subject: [PATCH] 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.
---
 demux/ebml.c            |  1 -
 osdep/mpbswap.h         | 32 --------------------------------
 stream/stream.c         |  3 +--
 video/decode/vd_lavc.c  |  1 -
 video/filter/vf_divtc.c |  7 ++++---
 5 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 osdep/mpbswap.h

diff --git a/demux/ebml.c b/demux/ebml.c
index 0df683adcd..7e7765e425 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -34,7 +34,6 @@
 #include "talloc.h"
 #include "ebml.h"
 #include "stream/stream.h"
-#include "osdep/mpbswap.h"
 #include "common/msg.h"
 
 // Whether the id is a known Matroska level 1 element (allowed as element on
diff --git a/osdep/mpbswap.h b/osdep/mpbswap.h
deleted file mode 100644
index f75c8b86c8..0000000000
--- a/osdep/mpbswap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_MPBSWAP_H
-#define MPLAYER_MPBSWAP_H
-
-#include <libavutil/bswap.h>
-
-#define bswap_16(x) av_bswap16(x)
-#define bswap_32(x) av_bswap32(x)
-#define be2me_16(x) av_be2ne16(x)
-#define be2me_32(x) av_be2ne32(x)
-#define le2me_16(x) av_le2ne16(x)
-#define le2me_32(x) av_le2ne32(x)
-#define le2me_64(x) av_le2ne64(x)
-
-#endif /* MPLAYER_MPBSWAP_H */
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;
 }
 
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index abed77dd2c..b500bdb889 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -36,7 +36,6 @@
 #include "common/av_common.h"
 #include "common/codecs.h"
 
-#include "osdep/mpbswap.h"
 #include "video/fmt-conversion.h"
 
 #include "vd.h"
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 79abd94065..6c416e0d41 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -23,10 +23,11 @@
 #include <math.h>
 #include <stdint.h>
 
+#include <libavutil/bswap.h>
+
 #include "config.h"
 #include "common/msg.h"
 #include "options/m_option.h"
-#include "osdep/mpbswap.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
@@ -119,9 +120,9 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z,
          wsum^=*(wsum_t *)p;
 
 #if FAST_64BIT
-      t=be2me_32((uint32_t)(wsum>>32^wsum));
+      t=av_be2ne32((uint32_t)(wsum>>32^wsum));
 #else
-      t=be2me_32(wsum);
+      t=av_be2ne32(wsum);
 #endif
 
       for(sum^=(t<<shift|t>>(32-shift)); p<e;)