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 /video | |
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 'video')
-rw-r--r-- | video/decode/vd_lavc.c | 1 | ||||
-rw-r--r-- | video/filter/vf_divtc.c | 7 |
2 files changed, 4 insertions, 4 deletions
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;) |