diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 18:36:36 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 18:36:36 +0000 |
commit | e085bc8dcf9abd5b492cac5ae35988bf26cb77b4 (patch) | |
tree | 94ab3b303ad16ff3cdbcb967ee63fa2a3e808d7d | |
parent | 8cb954b89af8dd58f899c028e25bcc249eb5673f (diff) | |
download | mpv-e085bc8dcf9abd5b492cac5ae35988bf26cb77b4.tar.bz2 mpv-e085bc8dcf9abd5b492cac5ae35988bf26cb77b4.tar.xz |
Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
55 files changed, 56 insertions, 56 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index c3ec32c060..55e28360c5 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -65,7 +65,7 @@ SRCS_MENCODER = muxer.c \ SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c -CFLAGS = -I../stream -I../loader +CFLAGS = -I../loader CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 4101f96d8f..d7403e26d0 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -11,7 +11,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 60984e6f06..29a711b6e6 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index c23af4bf19..fad1e9d951 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -6,7 +6,7 @@ #include "config.h" // for avi_stream_id(): -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "aviheader.h" diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 559fac27a8..e8eb8330b9 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -6,7 +6,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "parse_es.h" #include "stheader.h" diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index ca8c9d716e..5f0af40db6 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "asf.h" #include "demuxer.h" diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index a9bf83e7ec..dd165b5c83 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <stdio.h> -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "genres.h" diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index ec5527d218..6ee50a55de 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index d8ca99244a..e46dbc929b 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -27,7 +27,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "libvo/fastmemcpy.h" diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index a71d80892b..1edd1429cb 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <stdio.h> -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index 38a06546f5..be2c5ab43b 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -18,7 +18,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c index 8ad1c95354..23ff993ec0 100644 --- a/libmpdemux/demux_fli.c +++ b/libmpdemux/demux_fli.c @@ -11,7 +11,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index f23144a0a3..3d8b3ff3f8 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -12,7 +12,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index bb45cc9d36..48715e477f 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -25,7 +25,7 @@ #include "mp_msg.h" // #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "m_option.h" diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 4175a21f9d..a5604b605f 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -13,7 +13,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index 6c706b1f29..943c89ee8d 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -10,7 +10,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "mf.h" diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 325e57bb2d..a197830b72 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -13,7 +13,7 @@ #include <ctype.h> #include <inttypes.h> -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "ebml.h" diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 784ee4a323..3826b969d9 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -36,7 +36,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c index e2b13a1a13..5f18d405f7 100644 --- a/libmpdemux/demux_mpc.c +++ b/libmpdemux/demux_mpc.c @@ -13,7 +13,7 @@ #include "mp_msg.h" #include "libavutil/common.h" #include "mpbswap.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index d1c78708d4..7c0ed1da22 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -9,7 +9,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "parse_es.h" #include "stheader.h" diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c index 0987aa29b9..ec33487874 100644 --- a/libmpdemux/demux_nsv.c +++ b/libmpdemux/demux_nsv.c @@ -16,7 +16,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c index 12cc3d66d2..68798d93ba 100644 --- a/libmpdemux/demux_nut.c +++ b/libmpdemux/demux_nut.c @@ -4,7 +4,7 @@ #include "config.h" #include "mp_msg.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c index fdce7f4acd..b9cfdd0782 100644 --- a/libmpdemux/demux_nuv.c +++ b/libmpdemux/demux_nuv.c @@ -13,7 +13,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "nuppelvideo.h" diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 31eb5d7766..483f959380 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -10,7 +10,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index ed13a68e7a..6a9762b652 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -26,7 +26,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index ad89c967ba..603514d5ef 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -8,7 +8,7 @@ #include "m_option.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_rawdv.c b/libmpdemux/demux_rawdv.c index 388fe1c543..ce2e87a2cb 100644 --- a/libmpdemux/demux_rawdv.c +++ b/libmpdemux/demux_rawdv.c @@ -15,7 +15,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index d493792cbd..262f473194 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -8,7 +8,7 @@ #include "m_option.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 36694c4104..4a51669155 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -28,7 +28,7 @@ Video codecs: (supported by RealPlayer8 for Linux) #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c index 363262d7ae..7d05c09d79 100644 --- a/libmpdemux/demux_realaud.c +++ b/libmpdemux/demux_realaud.c @@ -11,7 +11,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c index df542bab9d..7b80edbb6c 100644 --- a/libmpdemux/demux_roq.c +++ b/libmpdemux/demux_roq.c @@ -13,7 +13,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index fd51a50e7f..8d8277bad0 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.h @@ -5,7 +5,7 @@ #include <stdio.h> #ifndef __STREAM_H -#include "stream.h" +#include "stream/stream.h" #endif #ifndef __DEMUXER_H #include "demuxer.h" diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index 708b12e97c..abcfd819fe 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -5,7 +5,7 @@ extern "C" { #ifndef __STREAM_H -#include "stream.h" +#include "stream/stream.h" #endif #ifndef __DEMUXER_H #include "demuxer.h" diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c index 2ae15ea359..7637bf2fa5 100644 --- a/libmpdemux/demux_smjpeg.c +++ b/libmpdemux/demux_smjpeg.c @@ -17,7 +17,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index fc0b021714..370457925b 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -29,7 +29,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "parse_es.h" #include "stheader.h" diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 1ee90b1fe4..799d2a77c6 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -39,7 +39,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "parse_es.h" #include "stheader.h" diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index ec8a8340bb..9ca7e47c3b 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -17,7 +17,7 @@ #include "mp_msg.h" #include "help_mp.h" -//#include "stream.h" +//#include "stream/stream.h" //#include "demuxer.h" //#include "parse_es.h" //#include "stheader.h" diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 290ca18833..f9d2a0daae 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -10,7 +10,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 3aa0c204e0..b7f071a849 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -5,7 +5,7 @@ #include "libavutil/common.h" #include "mpbswap.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "libmpcodecs/vqf.h" diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index 14435f4f41..2617ed962b 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -33,7 +33,7 @@ #include "m_option.h" #include "libaf/af_format.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_y4m.c b/libmpdemux/demux_y4m.c index 113cb56f47..38d74f83c2 100644 --- a/libmpdemux/demux_y4m.c +++ b/libmpdemux/demux_y4m.c @@ -12,7 +12,7 @@ #include "help_mp.h" #include "yuv4mpeg.h" -//#include "stream.h" +//#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 1ab2f37bd3..5546d8b09b 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -15,7 +15,7 @@ #include "libvo/fastmemcpy.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" #include "stheader.h" #include "mf.h" diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c index f88fdfd4c3..756d1713ce 100644 --- a/libmpdemux/ebml.c +++ b/libmpdemux/ebml.c @@ -9,7 +9,7 @@ #include <stdlib.h> -#include "stream.h" +#include "stream/stream.h" #include "ebml.h" #include "libavutil/common.h" #include "mpbswap.h" diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 2da8e22728..1c95fe5705 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -5,7 +5,7 @@ #include "config.h" -#include "stream.h" +#include "stream/stream.h" #include "demuxer.h" /* diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index 2c05ea0e35..f764a1d3da 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -19,7 +19,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "stream.h" +#include "stream/stream.h" #include "mf.h" |