From debbff76f9b97f77ffa6249e92d2573548a99a40 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 25 Sep 2014 19:58:22 +0200 Subject: 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. --- video/decode/vd_lavc.c | 1 - video/filter/vf_divtc.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'video') 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 #include +#include + #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<>(32-shift)); p