diff options
Diffstat (limited to 'demux')
-rw-r--r-- | demux/asf.h | 2 | ||||
-rw-r--r-- | demux/asfguid.h | 2 | ||||
-rw-r--r-- | demux/asfheader.c | 4 | ||||
-rw-r--r-- | demux/asfheader.h | 2 | ||||
-rw-r--r-- | demux/aviheader.c | 4 | ||||
-rw-r--r-- | demux/aviheader.h | 2 | ||||
-rw-r--r-- | demux/aviprint.c | 2 | ||||
-rw-r--r-- | demux/demux.c | 9 | ||||
-rw-r--r-- | demux/demux.h | 4 | ||||
-rw-r--r-- | demux/demux_asf.c | 6 | ||||
-rw-r--r-- | demux/demux_avi.c | 4 | ||||
-rw-r--r-- | demux/demux_cue.c | 4 | ||||
-rw-r--r-- | demux/demux_edl.c | 2 | ||||
-rw-r--r-- | demux/demux_gif.c | 7 | ||||
-rw-r--r-- | demux/demux_lavf.c | 14 | ||||
-rw-r--r-- | demux/demux_mf.c | 4 | ||||
-rw-r--r-- | demux/demux_mkv.c | 8 | ||||
-rw-r--r-- | demux/demux_mng.c | 6 | ||||
-rw-r--r-- | demux/demux_mpg.c | 8 | ||||
-rw-r--r-- | demux/demux_rawaudio.c | 6 | ||||
-rw-r--r-- | demux/demux_rawvideo.c | 6 | ||||
-rw-r--r-- | demux/demux_ts.c | 8 | ||||
-rw-r--r-- | demux/ebml.c | 4 | ||||
-rw-r--r-- | demux/ebml.h | 2 | ||||
-rw-r--r-- | demux/extension.c | 4 | ||||
-rw-r--r-- | demux/mf.c | 4 | ||||
-rw-r--r-- | demux/mp3_hdr.c | 2 | ||||
-rw-r--r-- | demux/mpeg_hdr.c | 2 | ||||
-rw-r--r-- | demux/parse_es.c | 4 | ||||
-rw-r--r-- | demux/parse_es.h | 2 | ||||
-rw-r--r-- | demux/video.c | 4 |
31 files changed, 71 insertions, 71 deletions
diff --git a/demux/asf.h b/demux/asf.h index 2886a4d752..db48f72edb 100644 --- a/demux/asf.h +++ b/demux/asf.h @@ -22,7 +22,7 @@ #include <sys/types.h> #include <inttypes.h> #include "libavutil/common.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" /////////////////////// // ASF Object Header diff --git a/demux/asfguid.h b/demux/asfguid.h index 91b2760b28..e1dfed87d1 100644 --- a/demux/asfguid.h +++ b/demux/asfguid.h @@ -23,7 +23,7 @@ #include <inttypes.h> #include "libavutil/common.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" #define ASF_LOAD_GUID_PREFIX(guid) AV_RL32(guid) diff --git a/demux/asfheader.c b/demux/asfheader.c index bd775b7660..9bbe8e3dce 100644 --- a/demux/asfheader.c +++ b/demux/asfheader.c @@ -26,11 +26,11 @@ #include <libavutil/common.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" #include "aviprint.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "asf.h" diff --git a/demux/asfheader.h b/demux/asfheader.h index 9c239f7987..3741f22cd6 100644 --- a/demux/asfheader.h +++ b/demux/asfheader.h @@ -20,7 +20,7 @@ #define MPLAYER_ASFHEADER_H #include "asf.h" -#include "demuxer.h" +#include "demux.h" int asf_check_header(demuxer_t *demuxer); int read_asf_header(demuxer_t *demuxer, struct asf_priv *asf); diff --git a/demux/aviheader.c b/demux/aviheader.c index 0c47386dc5..a83ce1e0fb 100644 --- a/demux/aviheader.c +++ b/demux/aviheader.c @@ -25,10 +25,10 @@ #include <libavutil/intreadwrite.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "aviprint.h" #include "aviheader.h" diff --git a/demux/aviheader.h b/demux/aviheader.h index 1629a33b57..f1ec64a577 100644 --- a/demux/aviheader.h +++ b/demux/aviheader.h @@ -23,7 +23,7 @@ #include <stdint.h> #include "config.h" #include "libavutil/common.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" #ifndef mmioFOURCC #define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ diff --git a/demux/aviprint.c b/demux/aviprint.c index e7520a42c5..5d285c2104 100644 --- a/demux/aviprint.c +++ b/demux/aviprint.c @@ -25,7 +25,7 @@ // for avi_stream_id(): #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "aviheader.h" #include "ms_hdr.h" diff --git a/demux/demux.c b/demux/demux.c index 3673fd06e3..889fbea409 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -28,17 +28,16 @@ #include <sys/stat.h> #include "config.h" -#include "options.h" +#include "core/options.h" #include "talloc.h" -#include "mp_msg.h" -#include "m_config.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "mf.h" -#include "libaf/format.h" +#include "audio/format.h" #include "libavcodec/avcodec.h" #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE diff --git a/demux/demux.h b/demux/demux.h index f44c728c1e..4ab4581b2a 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -25,8 +25,8 @@ #include <string.h> #include <stdbool.h> -#include "bstr.h" -#include "mpcommon.h" +#include "core/bstr.h" +#include "core/mp_common.h" #include "demux_packet.h" #include "stheader.h" diff --git a/demux/demux_asf.c b/demux/demux_asf.c index 9d189ef095..010aad4677 100644 --- a/demux/demux_asf.c +++ b/demux/demux_asf.c @@ -27,13 +27,13 @@ #include <libavutil/intreadwrite.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" #include "asf.h" #include "asfheader.h" -#include "demuxer.h" -#include "libmpcodecs/dec_audio.h" +#include "demux.h" +#include "audio/decode/dec_audio.h" // based on asf file-format doc by Eugene [http://divx.euro.ru] diff --git a/demux/demux_avi.c b/demux/demux_avi.c index 887494c6cd..9842c1c10c 100644 --- a/demux/demux_avi.c +++ b/demux/demux_avi.c @@ -24,10 +24,10 @@ #include <unistd.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "aviheader.h" diff --git a/demux/demux_cue.c b/demux/demux_cue.c index d2fd06ce71..31a3e00e40 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -20,8 +20,8 @@ #include <stdbool.h> #include <string.h> -#include "bstr.h" -#include "demuxer.h" +#include "core/bstr.h" +#include "demux.h" #include "stream/stream.h" // timeline/tl_cue.c diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 4c864cfe42..1e1db5be93 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -20,7 +20,7 @@ #include <stdbool.h> #include <string.h> -#include "demuxer.h" +#include "demux.h" #include "stream/stream.h" static int try_open_file(struct demuxer *demuxer) diff --git a/demux/demux_gif.c b/demux/demux_gif.c index 18bf9abfd7..cd82609ee4 100644 --- a/demux/demux_gif.c +++ b/demux/demux_gif.c @@ -26,14 +26,15 @@ #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" +#include "video/memcpy_pic.h" #include <gif_lib.h> -#include "libvo/fastmemcpy.h" + typedef struct { int current_pts; unsigned char *palette; diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 35f3f6a83e..a411441873 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -32,19 +32,19 @@ #include <libavutil/avstring.h> #include <libavutil/mathematics.h> #include <libavutil/opt.h> -#include "libav_compat.h" +#include "compat/libav.h" #include "config.h" -#include "options.h" -#include "mp_msg.h" -#include "av_opts.h" -#include "bstr.h" +#include "core/options.h" +#include "core/mp_msg.h" +#include "core/av_opts.h" +#include "core/bstr.h" #include "stream/stream.h" #include "aviprint.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" -#include "m_option.h" +#include "core/m_option.h" #include "mp_taglists.h" diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 6f0f0de897..fdfa21c4a3 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -27,10 +27,10 @@ #include "talloc.h" #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "mf.h" diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 3093fcae0f..528d086e81 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -39,16 +39,16 @@ #endif #include "talloc.h" -#include "options.h" -#include "bstr.h" +#include "core/options.h" +#include "core/bstr.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "ebml.h" #include "matroska.h" //#include "demux_real.h" -#include "mp_msg.h" +#include "core/mp_msg.h" static const unsigned char sipr_swaps[38][2] = { {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, diff --git a/demux/demux_mng.c b/demux/demux_mng.c index ad08ba8c4b..1d21d9d218 100644 --- a/demux/demux_mng.c +++ b/demux/demux_mng.c @@ -26,12 +26,12 @@ #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" -#include "libmpcodecs/img_format.h" +#include "video/img_format.h" #define MNG_SUPPORT_READ #define MNG_SUPPORT_DISPLAY diff --git a/demux/demux_mpg.c b/demux/demux_mpg.c index 44ec85d2db..7c943a87b1 100644 --- a/demux/demux_mpg.c +++ b/demux/demux_mpg.c @@ -25,13 +25,13 @@ #include <math.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" #include "libavutil/attributes.h" -#include "libmpcodecs/dec_audio.h" +#include "audio/decode/dec_audio.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "parse_es.h" #include "stheader.h" #include "mp3_hdr.h" diff --git a/demux/demux_rawaudio.c b/demux/demux_rawaudio.c index 2a8fea05f0..2551e2794a 100644 --- a/demux/demux_rawaudio.c +++ b/demux/demux_rawaudio.c @@ -23,12 +23,12 @@ #include <unistd.h> #include <string.h> -#include "m_option.h" +#include "core/m_option.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" -#include "libaf/format.h" +#include "audio/format.h" static int channels = 2; diff --git a/demux/demux_rawvideo.c b/demux/demux_rawvideo.c index e84caafd01..197c48a454 100644 --- a/demux/demux_rawvideo.c +++ b/demux/demux_rawvideo.c @@ -23,13 +23,13 @@ #include <unistd.h> #include <string.h> -#include "m_option.h" +#include "core/m_option.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" -#include "libmpcodecs/img_format.h" +#include "video/img_format.h" static int format = IMGFMT_I420; static int size_id = 0; diff --git a/demux/demux_ts.c b/demux/demux_ts.c index b59066327d..a28f177f8e 100644 --- a/demux/demux_ts.c +++ b/demux/demux_ts.c @@ -27,12 +27,12 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" -#include "libmpcodecs/dec_audio.h" +#include "audio/decode/dec_audio.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "parse_es.h" #include "stheader.h" #include "ms_hdr.h" diff --git a/demux/ebml.c b/demux/ebml.c index fba8177805..3d1da44e58 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -34,8 +34,8 @@ #include "talloc.h" #include "ebml.h" #include "stream/stream.h" -#include "mpbswap.h" -#include "mp_msg.h" +#include "compat/mpbswap.h" +#include "core/mp_msg.h" #ifndef SIZE_MAX #define SIZE_MAX ((size_t)-1) diff --git a/demux/ebml.h b/demux/ebml.h index 866e620c61..492144e5b7 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -24,7 +24,7 @@ #include <stdbool.h> #include "stream/stream.h" -#include "bstr.h" +#include "core/bstr.h" /* EBML version supported */ diff --git a/demux/extension.c b/demux/extension.c index 6845c36af3..71b5bf8f4d 100644 --- a/demux/extension.c +++ b/demux/extension.c @@ -23,7 +23,7 @@ #include "config.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" /* * An autodetection based on the extension is not a good idea, but we don't care ;-) @@ -31,7 +31,7 @@ * You should not add anything here where autodetection can be easily fixed except in * order to speed up auto-detection, in particular for formats that are often streamed. * In particular you should not normally add any DEMUXER_TYPE_LAVF, adding the - * format to preferred_list in libmpdemux/demuxer_lavf.c will usually achieve + * format to preferred_list in demux/demuxer_lavf.c will usually achieve * the same effect in a much more reliable way. */ static struct { diff --git a/demux/mf.c b/demux/mf.c index d232944593..440156087e 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -37,9 +37,9 @@ #endif #include "osdep/strsep.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "path.h" +#include "core/path.h" #include "mf.h" diff --git a/demux/mp3_hdr.c b/demux/mp3_hdr.c index a4834f4f81..27a02368da 100644 --- a/demux/mp3_hdr.c +++ b/demux/mp3_hdr.c @@ -20,7 +20,7 @@ #include "config.h" #include "mp3_hdr.h" -#include "mp_msg.h" +#include "core/mp_msg.h" //----------------------- mp3 audio frame header parser ----------------------- diff --git a/demux/mpeg_hdr.c b/demux/mpeg_hdr.c index 0c368aa7a2..fcc4a33ecc 100644 --- a/demux/mpeg_hdr.c +++ b/demux/mpeg_hdr.c @@ -26,7 +26,7 @@ #include "config.h" #include "mpeg_hdr.h" #include "libavutil/attributes.h" -#include "mp_msg.h" +#include "core/mp_msg.h" static float frameratecode2framerate[16] = { 0, diff --git a/demux/parse_es.c b/demux/parse_es.c index 05507a495a..8e43446c1f 100644 --- a/demux/parse_es.c +++ b/demux/parse_es.c @@ -24,10 +24,10 @@ #include <unistd.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "parse_es.h" //static unsigned char videobuffer[MAX_VIDEO_PACKET_SIZE]; diff --git a/demux/parse_es.h b/demux/parse_es.h index ed76593e50..af558e379d 100644 --- a/demux/parse_es.h +++ b/demux/parse_es.h @@ -21,7 +21,7 @@ #include <stdint.h> -#include "demuxer.h" +#include "demux.h" #define MAX_VIDEO_PACKET_SIZE (224*1024+4) #define VIDEOBUFFER_SIZE 0x100000 diff --git a/demux/video.c b/demux/video.c index 11e512f119..089bc852b4 100644 --- a/demux/video.c +++ b/demux/video.c @@ -27,10 +27,10 @@ #include <libavutil/mem.h> -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "parse_es.h" #include "mpeg_hdr.h" |