[MPlayer-cvslog] r22618 - in trunk/libmpcodecs: ae.c ae_faac.c ae_lame.c ae_lavc.c ae_pcm.c ae_toolame.c ae_twolame.c ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c ve_vfw.c ve_x264.c ve_xvid4.c

[diego]

Author: diego
Date: Thu Mar 15 18:30:55 2007
New Revision: 22618

Modified:
   trunk/libmpcodecs/ae.c
   trunk/libmpcodecs/ae_faac.c
   trunk/libmpcodecs/ae_lame.c
   trunk/libmpcodecs/ae_lavc.c
   trunk/libmpcodecs/ae_pcm.c
   trunk/libmpcodecs/ae_toolame.c
   trunk/libmpcodecs/ae_twolame.c
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpcodecs/ve_libdv.c
   trunk/libmpcodecs/ve_nuv.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/ve_raw.c
   trunk/libmpcodecs/ve_vfw.c
   trunk/libmpcodecs/ve_x264.c
   trunk/libmpcodecs/ve_xvid4.c

Log:
Add explicit location for headers from the stream/ directory.
Now for the encoding-related files as well.


Modified: trunk/libmpcodecs/ae.c
==============================================================================
--- trunk/libmpcodecs/ae.c	(original)
+++ trunk/libmpcodecs/ae.c	Thu Mar 15 18:30:55 2007
@@ -7,7 +7,7 @@
 #include <math.h>
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae.h"
 #include "config.h"

Modified: trunk/libmpcodecs/ae_faac.c
==============================================================================
--- trunk/libmpcodecs/ae_faac.c	(original)
+++ trunk/libmpcodecs/ae_faac.c	Thu Mar 15 18:30:55 2007
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include <faac.h>
 #include "ae.h"

Modified: trunk/libmpcodecs/ae_lame.c
==============================================================================
--- trunk/libmpcodecs/ae_lame.c	(original)
+++ trunk/libmpcodecs/ae_lame.c	Thu Mar 15 18:30:55 2007
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "help_mp.h"
 #include "ae_pcm.h"

Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c	(original)
+++ trunk/libmpcodecs/ae_lavc.c	Thu Mar 15 18:30:55 2007
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"

Modified: trunk/libmpcodecs/ae_pcm.c
==============================================================================
--- trunk/libmpcodecs/ae_pcm.c	(original)
+++ trunk/libmpcodecs/ae_pcm.c	Thu Mar 15 18:30:55 2007
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_pcm.h"
 

Modified: trunk/libmpcodecs/ae_toolame.c
==============================================================================
--- trunk/libmpcodecs/ae_toolame.c	(original)
+++ trunk/libmpcodecs/ae_toolame.c	Thu Mar 15 18:30:55 2007
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_toolame.h"
 #include "libmpdemux/mp3_hdr.h"

Modified: trunk/libmpcodecs/ae_twolame.c
==============================================================================
--- trunk/libmpcodecs/ae_twolame.c	(original)
+++ trunk/libmpcodecs/ae_twolame.c	Thu Mar 15 18:30:55 2007
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_twolame.h"
 #include "libmpdemux/mp3_hdr.h"

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	(original)
+++ trunk/libmpcodecs/ve_lavc.c	Thu Mar 15 18:30:55 2007
@@ -16,7 +16,7 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

Modified: trunk/libmpcodecs/ve_libdv.c
==============================================================================
--- trunk/libmpcodecs/ve_libdv.c	(original)
+++ trunk/libmpcodecs/ve_libdv.c	Thu Mar 15 18:30:55 2007
@@ -9,11 +9,11 @@
 #include "mp_msg.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	(original)
+++ trunk/libmpcodecs/ve_nuv.c	Thu Mar 15 18:30:55 2007
@@ -8,11 +8,11 @@
 #include "m_option.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	(original)
+++ trunk/libmpcodecs/ve_qtvideo.c	Thu Mar 15 18:30:55 2007
@@ -21,11 +21,11 @@
 #include "loader/wine/windef.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"

Modified: trunk/libmpcodecs/ve_raw.c
==============================================================================
--- trunk/libmpcodecs/ve_raw.c	(original)
+++ trunk/libmpcodecs/ve_raw.c	Thu Mar 15 18:30:55 2007
@@ -7,11 +7,11 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	(original)
+++ trunk/libmpcodecs/ve_vfw.c	Thu Mar 15 18:30:55 2007
@@ -11,7 +11,7 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-//#include "stream.h"
+//#include "stream/stream.h"
 //#include "demuxer.h"
 //#include "stheader.h"
 
@@ -24,7 +24,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 //===========================================================================//

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	(original)
+++ trunk/libmpcodecs/ve_x264.c	Thu Mar 15 18:30:55 2007
@@ -35,11 +35,11 @@
 
 #include "m_option.h"
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"

Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c	(original)
+++ trunk/libmpcodecs/ve_xvid4.c	Thu Mar 15 18:30:55 2007
@@ -37,11 +37,11 @@
 #include "mp_msg.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"