diff options
| author | wm4 <wm4@nowhere> | 2013-07-07 23:54:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-07 23:54:11 +0200 |
| commit | af0c41e162725b0edcd6c3d066a2dbef05a3b896 (patch) | |
| tree | 607f2aa997815accec54e838cde124df845c7f38 /demux/ms_hdr.h | |
| parent | 8781e5a55c5f250e7c637a4cc9c4d8f91b227314 (diff) | |
| download | mpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.bz2 mpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.xz | |
Remove old demuxers
Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does
better than them (except in rare corner cases), and the demuxers have
a bad influence on the rest of the code. Often they don't output
proper packets, and require additional audio and video parsing. Most
work only in --no-correct-pts mode.
Remove them to facilitate further cleanups.
Diffstat (limited to 'demux/ms_hdr.h')
| -rw-r--r-- | demux/ms_hdr.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/demux/ms_hdr.h b/demux/ms_hdr.h index 8e545635dd..7f837a58a4 100644 --- a/demux/ms_hdr.h +++ b/demux/ms_hdr.h @@ -22,6 +22,14 @@ #include <sys/types.h> #include "config.h" +#include "compat/mpbswap.h" + +#ifndef mmioFOURCC +#define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ + ( (uint32_t)(uint8_t)(ch0) | ( (uint32_t)(uint8_t)(ch1) << 8 ) | \ + ( (uint32_t)(uint8_t)(ch2) << 16 ) | ( (uint32_t)(uint8_t)(ch3) << 24 ) ) +#endif + #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct __attribute__((__packed__)) _WAVEFORMATEX { |