[MPlayer-cvslog] r22619 - in trunk/libmpcodecs: Makefile ad.c ad_internal.h ad_libdv.c ae.c ae_faac.c ae_lame.c ae_lavc.c ae_pcm.c ae_toolame.c ae_twolame.c dec_audio.c dec_video.c vd.c vd_internal.h vd_libdv.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
subversion at mplayerhq.hu
Thu Mar 15 18:51:32 CET 2007
Author: diego
Date: Thu Mar 15 18:51:32 2007
New Revision: 22619
Modified:
trunk/libmpcodecs/Makefile
trunk/libmpcodecs/ad.c
trunk/libmpcodecs/ad_internal.h
trunk/libmpcodecs/ad_libdv.c
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/dec_audio.c
trunk/libmpcodecs/dec_video.c
trunk/libmpcodecs/vd.c
trunk/libmpcodecs/vd_internal.h
trunk/libmpcodecs/vd_libdv.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 libmpdemux/ directory.
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Thu Mar 15 18:51:32 2007
@@ -147,8 +147,6 @@ SRCS_MENCODER-$(TWOLAME) +=
SRCS_MENCODER-$(MP3LAME) += ae_lame.c
-CFLAGS = -I../libmpdemux \
-
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
Modified: trunk/libmpcodecs/ad.c
==============================================================================
--- trunk/libmpcodecs/ad.c (original)
+++ trunk/libmpcodecs/ad.c Thu Mar 15 18:51:32 2007
@@ -9,8 +9,8 @@
#include "config.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "ad.h"
/* Missed vorbis, mad, dshow */
Modified: trunk/libmpcodecs/ad_internal.h
==============================================================================
--- trunk/libmpcodecs/ad_internal.h (original)
+++ trunk/libmpcodecs/ad_internal.h Thu Mar 15 18:51:32 2007
@@ -3,8 +3,8 @@
#include "libaf/af_format.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "ad.h"
Modified: trunk/libmpcodecs/ad_libdv.c
==============================================================================
--- trunk/libmpcodecs/ad_libdv.c (original)
+++ trunk/libmpcodecs/ad_libdv.c Thu Mar 15 18:51:32 2007
@@ -15,8 +15,8 @@
#include <libdv/dv_types.h>
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "ad_internal.h"
Modified: trunk/libmpcodecs/ae.c
==============================================================================
--- trunk/libmpcodecs/ae.c (original)
+++ trunk/libmpcodecs/ae.c Thu Mar 15 18:51:32 2007
@@ -5,10 +5,10 @@
#include <unistd.h>
#include <sys/types.h>
#include <math.h>
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/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:51:32 2007
@@ -6,11 +6,11 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
#include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/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:51:32 2007
@@ -6,10 +6,10 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "help_mp.h"
#include "ae_pcm.h"
#include "libaf/af_format.h"
Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c (original)
+++ trunk/libmpcodecs/ae_lavc.c Thu Mar 15 18:51:32 2007
@@ -6,10 +6,10 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "ae_lavc.h"
#include "help_mp.h"
#include "config.h"
Modified: trunk/libmpcodecs/ae_pcm.c
==============================================================================
--- trunk/libmpcodecs/ae_pcm.c (original)
+++ trunk/libmpcodecs/ae_pcm.c Thu Mar 15 18:51:32 2007
@@ -6,11 +6,11 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
#include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/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:51:32 2007
@@ -6,11 +6,11 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
#include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/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:51:32 2007
@@ -6,11 +6,11 @@
#include <sys/types.h>
#include "m_option.h"
#include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
#include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "ae_twolame.h"
#include "libmpdemux/mp3_hdr.h"
Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c (original)
+++ trunk/libmpcodecs/dec_audio.c Thu Mar 15 18:51:32 2007
@@ -7,10 +7,10 @@
#include "help_mp.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
#include "codec-cfg.h"
-#include "stheader.h"
+#include "libmpdemux/stheader.h"
#include "dec_audio.h"
#include "ad.h"
Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c (original)
+++ trunk/libmpcodecs/dec_video.c Thu Mar 15 18:51:32 2007
@@ -15,14 +15,14 @@
#include "osdep/shmem.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "parse_es.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/parse_es.h"
#include "codec-cfg.h"
#include "libvo/video_out.h"
-#include "stheader.h"
+#include "libmpdemux/stheader.h"
#include "vd.h"
#include "vf.h"
Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c (original)
+++ trunk/libmpcodecs/vd.c Thu Mar 15 18:51:32 2007
@@ -18,8 +18,8 @@
#include "img_format.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "dec_video.h"
#include "vd.h"
Modified: trunk/libmpcodecs/vd_internal.h
==============================================================================
--- trunk/libmpcodecs/vd_internal.h (original)
+++ trunk/libmpcodecs/vd_internal.h Thu Mar 15 18:51:32 2007
@@ -3,8 +3,8 @@
#include "img_format.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "vd.h"
Modified: trunk/libmpcodecs/vd_libdv.c
==============================================================================
--- trunk/libmpcodecs/vd_libdv.c (original)
+++ trunk/libmpcodecs/vd_libdv.c Thu Mar 15 18:51:32 2007
@@ -13,8 +13,8 @@
#include <libdv/dv_types.h>
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "vd_internal.h"
Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c (original)
+++ trunk/libmpcodecs/ve_lavc.c Thu Mar 15 18:51:32 2007
@@ -17,10 +17,10 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_libdv.c
==============================================================================
--- trunk/libmpcodecs/ve_libdv.c (original)
+++ trunk/libmpcodecs/ve_libdv.c Thu Mar 15 18:51:32 2007
@@ -10,11 +10,11 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c (original)
+++ trunk/libmpcodecs/ve_nuv.c Thu Mar 15 18:51:32 2007
@@ -9,11 +9,11 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c (original)
+++ trunk/libmpcodecs/ve_qtvideo.c Thu Mar 15 18:51:32 2007
@@ -22,11 +22,11 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_raw.c
==============================================================================
--- trunk/libmpcodecs/ve_raw.c (original)
+++ trunk/libmpcodecs/ve_raw.c Thu Mar 15 18:51:32 2007
@@ -8,11 +8,11 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c (original)
+++ trunk/libmpcodecs/ve_vfw.c Thu Mar 15 18:51:32 2007
@@ -12,8 +12,8 @@
#include "codec-cfg.h"
//#include "stream/stream.h"
-//#include "demuxer.h"
-//#include "stheader.h"
+//#include "libmpdemux/demuxer.h"
+//#include "libmpdemux/stheader.h"
#include "loader/loader.h"
//#include "loader/wine/mmreg.h"
@@ -25,7 +25,7 @@
#include "vf.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
//===========================================================================//
Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c (original)
+++ trunk/libmpcodecs/ve_x264.c Thu Mar 15 18:51:32 2007
@@ -36,11 +36,11 @@
#include "m_option.h"
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c (original)
+++ trunk/libmpcodecs/ve_xvid4.c Thu Mar 15 18:51:32 2007
@@ -38,11 +38,11 @@
#include "codec-cfg.h"
#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
#include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
#include "img_format.h"
#include "mp_image.h"
More information about the MPlayer-cvslog
mailing list