[MPlayer-cvslog] r22623 - in trunk/libmpdemux: Makefile asfheader.c aviheader.c aviprint.c demux_aac.c demux_asf.c demux_audio.c demux_avi.c demux_avs.c demux_demuxers.c demux_film.c demux_fli.c demux_gif.c demux_lavf.c demux_lmlm4.c demux_mf.c demux_mkv.c demux_mov.c demux_mpc.c demux_mpg.c demux_nsv.c demux_nut.c demux_nuv.c demux_ogg.c demux_pva.c demux_rawaudio.c demux_rawdv.c demux_rawvideo.c demux_real.c demux_realaud.c demux_roq.c demux_rtp.h demux_rtp_internal.h demux_smjpeg.c demux_ts.c demux_ty.c demux_ty_osd.c demux_viv.c demux_vqf.c demux_xmms.c demux_y4m.c demuxer.c ebml.c extension.c mf.c muxer.c muxer_avi.c muxer_lavf.c muxer_mpeg.c muxer_rawaudio.c muxer_rawvideo.c parse_es.c parse_mp4.c video.c yuv4mpeg.h
diego
subversion at mplayerhq.hu
Thu Mar 15 19:36:37 CET 2007
Author: diego
Date: Thu Mar 15 19:36:36 2007
New Revision: 22623
Modified:
trunk/libmpdemux/Makefile
trunk/libmpdemux/asfheader.c
trunk/libmpdemux/aviheader.c
trunk/libmpdemux/aviprint.c
trunk/libmpdemux/demux_aac.c
trunk/libmpdemux/demux_asf.c
trunk/libmpdemux/demux_audio.c
trunk/libmpdemux/demux_avi.c
trunk/libmpdemux/demux_avs.c
trunk/libmpdemux/demux_demuxers.c
trunk/libmpdemux/demux_film.c
trunk/libmpdemux/demux_fli.c
trunk/libmpdemux/demux_gif.c
trunk/libmpdemux/demux_lavf.c
trunk/libmpdemux/demux_lmlm4.c
trunk/libmpdemux/demux_mf.c
trunk/libmpdemux/demux_mkv.c
trunk/libmpdemux/demux_mov.c
trunk/libmpdemux/demux_mpc.c
trunk/libmpdemux/demux_mpg.c
trunk/libmpdemux/demux_nsv.c
trunk/libmpdemux/demux_nut.c
trunk/libmpdemux/demux_nuv.c
trunk/libmpdemux/demux_ogg.c
trunk/libmpdemux/demux_pva.c
trunk/libmpdemux/demux_rawaudio.c
trunk/libmpdemux/demux_rawdv.c
trunk/libmpdemux/demux_rawvideo.c
trunk/libmpdemux/demux_real.c
trunk/libmpdemux/demux_realaud.c
trunk/libmpdemux/demux_roq.c
trunk/libmpdemux/demux_rtp.h
trunk/libmpdemux/demux_rtp_internal.h
trunk/libmpdemux/demux_smjpeg.c
trunk/libmpdemux/demux_ts.c
trunk/libmpdemux/demux_ty.c
trunk/libmpdemux/demux_ty_osd.c
trunk/libmpdemux/demux_viv.c
trunk/libmpdemux/demux_vqf.c
trunk/libmpdemux/demux_xmms.c
trunk/libmpdemux/demux_y4m.c
trunk/libmpdemux/demuxer.c
trunk/libmpdemux/ebml.c
trunk/libmpdemux/extension.c
trunk/libmpdemux/mf.c
trunk/libmpdemux/muxer.c
trunk/libmpdemux/muxer_avi.c
trunk/libmpdemux/muxer_lavf.c
trunk/libmpdemux/muxer_mpeg.c
trunk/libmpdemux/muxer_rawaudio.c
trunk/libmpdemux/muxer_rawvideo.c
trunk/libmpdemux/parse_es.c
trunk/libmpdemux/parse_mp4.c
trunk/libmpdemux/video.c
trunk/libmpdemux/yuv4mpeg.h
Log:
Add explicit location for headers from the stream/ directory.
Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile (original)
+++ trunk/libmpdemux/Makefile Thu Mar 15 19:36:36 2007
@@ -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
Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c (original)
+++ trunk/libmpdemux/asfheader.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c (original)
+++ trunk/libmpdemux/aviheader.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/aviprint.c
==============================================================================
--- trunk/libmpdemux/aviprint.c (original)
+++ trunk/libmpdemux/aviprint.c Thu Mar 15 19:36:36 2007
@@ -6,7 +6,7 @@
#include "config.h"
// for avi_stream_id():
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "aviheader.h"
Modified: trunk/libmpdemux/demux_aac.c
==============================================================================
--- trunk/libmpdemux/demux_aac.c (original)
+++ trunk/libmpdemux/demux_aac.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_asf.c
==============================================================================
--- trunk/libmpdemux/demux_asf.c (original)
+++ trunk/libmpdemux/demux_asf.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_audio.c
==============================================================================
--- trunk/libmpdemux/demux_audio.c (original)
+++ trunk/libmpdemux/demux_audio.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_avi.c
==============================================================================
--- trunk/libmpdemux/demux_avi.c (original)
+++ trunk/libmpdemux/demux_avi.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_avs.c
==============================================================================
--- trunk/libmpdemux/demux_avs.c (original)
+++ trunk/libmpdemux/demux_avs.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_demuxers.c
==============================================================================
--- trunk/libmpdemux/demux_demuxers.c (original)
+++ trunk/libmpdemux/demux_demuxers.c Thu Mar 15 19:36:36 2007
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demux_film.c
==============================================================================
--- trunk/libmpdemux/demux_film.c (original)
+++ trunk/libmpdemux/demux_film.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_fli.c
==============================================================================
--- trunk/libmpdemux/demux_fli.c (original)
+++ trunk/libmpdemux/demux_fli.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_gif.c
==============================================================================
--- trunk/libmpdemux/demux_gif.c (original)
+++ trunk/libmpdemux/demux_gif.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c (original)
+++ trunk/libmpdemux/demux_lavf.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_lmlm4.c
==============================================================================
--- trunk/libmpdemux/demux_lmlm4.c (original)
+++ trunk/libmpdemux/demux_lmlm4.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_mf.c
==============================================================================
--- trunk/libmpdemux/demux_mf.c (original)
+++ trunk/libmpdemux/demux_mf.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c (original)
+++ trunk/libmpdemux/demux_mkv.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c (original)
+++ trunk/libmpdemux/demux_mov.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_mpc.c
==============================================================================
--- trunk/libmpdemux/demux_mpc.c (original)
+++ trunk/libmpdemux/demux_mpc.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c (original)
+++ trunk/libmpdemux/demux_mpg.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_nsv.c
==============================================================================
--- trunk/libmpdemux/demux_nsv.c (original)
+++ trunk/libmpdemux/demux_nsv.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_nut.c
==============================================================================
--- trunk/libmpdemux/demux_nut.c (original)
+++ trunk/libmpdemux/demux_nut.c Thu Mar 15 19:36:36 2007
@@ -4,7 +4,7 @@
#include "config.h"
#include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demux_nuv.c
==============================================================================
--- trunk/libmpdemux/demux_nuv.c (original)
+++ trunk/libmpdemux/demux_nuv.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c (original)
+++ trunk/libmpdemux/demux_ogg.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_pva.c
==============================================================================
--- trunk/libmpdemux/demux_pva.c (original)
+++ trunk/libmpdemux/demux_pva.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_rawaudio.c
==============================================================================
--- trunk/libmpdemux/demux_rawaudio.c (original)
+++ trunk/libmpdemux/demux_rawaudio.c Thu Mar 15 19:36:36 2007
@@ -8,7 +8,7 @@
#include "m_option.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demux_rawdv.c
==============================================================================
--- trunk/libmpdemux/demux_rawdv.c (original)
+++ trunk/libmpdemux/demux_rawdv.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_rawvideo.c
==============================================================================
--- trunk/libmpdemux/demux_rawvideo.c (original)
+++ trunk/libmpdemux/demux_rawvideo.c Thu Mar 15 19:36:36 2007
@@ -8,7 +8,7 @@
#include "m_option.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c (original)
+++ trunk/libmpdemux/demux_real.c Thu Mar 15 19:36:36 2007
@@ -28,7 +28,7 @@ Video codecs: (supported by RealPlayer8
#include "mp_msg.h"
#include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demux_realaud.c
==============================================================================
--- trunk/libmpdemux/demux_realaud.c (original)
+++ trunk/libmpdemux/demux_realaud.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_roq.c
==============================================================================
--- trunk/libmpdemux/demux_roq.c (original)
+++ trunk/libmpdemux/demux_roq.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_rtp.h
==============================================================================
--- trunk/libmpdemux/demux_rtp.h (original)
+++ trunk/libmpdemux/demux_rtp.h Thu Mar 15 19:36:36 2007
@@ -5,7 +5,7 @@
#include <stdio.h>
#ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
#endif
#ifndef __DEMUXER_H
#include "demuxer.h"
Modified: trunk/libmpdemux/demux_rtp_internal.h
==============================================================================
--- trunk/libmpdemux/demux_rtp_internal.h (original)
+++ trunk/libmpdemux/demux_rtp_internal.h Thu Mar 15 19:36:36 2007
@@ -5,7 +5,7 @@
extern "C" {
#ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
#endif
#ifndef __DEMUXER_H
#include "demuxer.h"
Modified: trunk/libmpdemux/demux_smjpeg.c
==============================================================================
--- trunk/libmpdemux/demux_smjpeg.c (original)
+++ trunk/libmpdemux/demux_smjpeg.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c (original)
+++ trunk/libmpdemux/demux_ts.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c (original)
+++ trunk/libmpdemux/demux_ty.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c (original)
+++ trunk/libmpdemux/demux_ty_osd.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_viv.c
==============================================================================
--- trunk/libmpdemux/demux_viv.c (original)
+++ trunk/libmpdemux/demux_viv.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_vqf.c
==============================================================================
--- trunk/libmpdemux/demux_vqf.c (original)
+++ trunk/libmpdemux/demux_vqf.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_xmms.c
==============================================================================
--- trunk/libmpdemux/demux_xmms.c (original)
+++ trunk/libmpdemux/demux_xmms.c Thu Mar 15 19:36:36 2007
@@ -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"
Modified: trunk/libmpdemux/demux_y4m.c
==============================================================================
--- trunk/libmpdemux/demux_y4m.c (original)
+++ trunk/libmpdemux/demux_y4m.c Thu Mar 15 19:36:36 2007
@@ -12,7 +12,7 @@
#include "help_mp.h"
#include "yuv4mpeg.h"
-//#include "stream.h"
+//#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c (original)
+++ trunk/libmpdemux/demuxer.c Thu Mar 15 19:36:36 2007
@@ -15,7 +15,7 @@
#include "libvo/fastmemcpy.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "mf.h"
Modified: trunk/libmpdemux/ebml.c
==============================================================================
--- trunk/libmpdemux/ebml.c (original)
+++ trunk/libmpdemux/ebml.c Thu Mar 15 19:36:36 2007
@@ -9,7 +9,7 @@
#include <stdlib.h>
-#include "stream.h"
+#include "stream/stream.h"
#include "ebml.h"
#include "libavutil/common.h"
#include "mpbswap.h"
Modified: trunk/libmpdemux/extension.c
==============================================================================
--- trunk/libmpdemux/extension.c (original)
+++ trunk/libmpdemux/extension.c Thu Mar 15 19:36:36 2007
@@ -5,7 +5,7 @@
#include "config.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
/*
Modified: trunk/libmpdemux/mf.c
==============================================================================
--- trunk/libmpdemux/mf.c (original)
+++ trunk/libmpdemux/mf.c Thu Mar 15 19:36:36 2007
@@ -19,7 +19,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "mf.h"
Modified: trunk/libmpdemux/muxer.c
==============================================================================
--- trunk/libmpdemux/muxer.c (original)
+++ trunk/libmpdemux/muxer.c Thu Mar 15 19:36:36 2007
@@ -11,7 +11,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "muxer.h"
#include "demuxer.h"
#include "mp_msg.h"
Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c (original)
+++ trunk/libmpdemux/muxer_avi.c Thu Mar 15 19:36:36 2007
@@ -8,7 +8,7 @@
#include "config.h"
#include "version.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c (original)
+++ trunk/libmpdemux/muxer_lavf.c Thu Mar 15 19:36:36 2007
@@ -12,7 +12,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "muxer.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c (original)
+++ trunk/libmpdemux/muxer_mpeg.c Thu Mar 15 19:36:36 2007
@@ -12,7 +12,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "muxer.h"
#include "demuxer.h"
#include "stheader.h"
Modified: trunk/libmpdemux/muxer_rawaudio.c
==============================================================================
--- trunk/libmpdemux/muxer_rawaudio.c (original)
+++ trunk/libmpdemux/muxer_rawaudio.c Thu Mar 15 19:36:36 2007
@@ -9,7 +9,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "muxer.h"
static muxer_stream_t* rawaudiofile_new_stream(muxer_t *muxer,int type){
Modified: trunk/libmpdemux/muxer_rawvideo.c
==============================================================================
--- trunk/libmpdemux/muxer_rawvideo.c (original)
+++ trunk/libmpdemux/muxer_rawvideo.c Thu Mar 15 19:36:36 2007
@@ -8,13 +8,13 @@
#include "config.h"
#include "version.h"
-//#include "stream.h"
+//#include "stream/stream.h"
//#include "demuxer.h"
//#include "stheader.h"
#include "aviheader.h"
#include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "muxer.h"
static muxer_stream_t* rawvideofile_new_stream(muxer_t *muxer,int type){
Modified: trunk/libmpdemux/parse_es.c
==============================================================================
--- trunk/libmpdemux/parse_es.c (original)
+++ trunk/libmpdemux/parse_es.c Thu Mar 15 19:36:36 2007
@@ -8,7 +8,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
#include "demuxer.h"
#include "parse_es.h"
Modified: trunk/libmpdemux/parse_mp4.c
==============================================================================
--- trunk/libmpdemux/parse_mp4.c (original)
+++ trunk/libmpdemux/parse_mp4.c Thu Mar 15 19:36:36 2007
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include "parse_mp4.h"
#include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"
//#define MP4_DUMPATOM
Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c (original)
+++ trunk/libmpdemux/video.c Thu Mar 15 19:36:36 2007
@@ -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"
#include "parse_es.h"
Modified: trunk/libmpdemux/yuv4mpeg.h
==============================================================================
--- trunk/libmpdemux/yuv4mpeg.h (original)
+++ trunk/libmpdemux/yuv4mpeg.h Thu Mar 15 19:36:36 2007
@@ -29,7 +29,7 @@
#include <stdlib.h>
//#include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"
More information about the MPlayer-cvslog
mailing list