diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
| commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
| tree | e1c4465768635d77954b5fd21ae726444ee4f48a /mpbswap.h | |
| parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
| parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
| download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'mpbswap.h')
| -rw-r--r-- | mpbswap.h | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -19,12 +19,14 @@ #ifndef MPLAYER_MPBSWAP_H #define MPLAYER_MPBSWAP_H -#include <sys/types.h> -#include "config.h" -#include "ffmpeg_files/bswap.h" +#include <libavutil/bswap.h> -#ifndef HAVE_SWAB -void swab(const void *from, void *to, ssize_t n); -#endif +#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 */ |