Mercurial > mplayer.hg

changeset 22601:ed8f90096c65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add explicit location for headers from the libmpdemux/ directory.
author diego
date Thu, 15 Mar 2007 17:51:32 +0000
parents 3c2b4a866c6a
children 195bebf09595
files libmpcodecs/Makefile libmpcodecs/ad.c libmpcodecs/ad_internal.h libmpcodecs/ad_libdv.c libmpcodecs/ae.c libmpcodecs/ae_faac.c libmpcodecs/ae_lame.c libmpcodecs/ae_lavc.c libmpcodecs/ae_pcm.c libmpcodecs/ae_toolame.c libmpcodecs/ae_twolame.c libmpcodecs/dec_audio.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vd_internal.h libmpcodecs/vd_libdv.c libmpcodecs/ve_lavc.c libmpcodecs/ve_libdv.c libmpcodecs/ve_nuv.c libmpcodecs/ve_qtvideo.c libmpcodecs/ve_raw.c libmpcodecs/ve_vfw.c libmpcodecs/ve_x264.c libmpcodecs/ve_xvid4.c
diffstat 24 files changed, 62 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/Makefile	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/Makefile	Thu Mar 15 17:51:32 2007 +0000
@@ -147,8 +147,6 @@
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS  = -I../libmpdemux \
-
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec
 
--- a/libmpcodecs/ad.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ad.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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 */
--- a/libmpcodecs/ad_internal.h	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ad_internal.h	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ad_libdv.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ad_libdv.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ae.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ae_faac.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_faac.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ae_lame.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_lame.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ae_lavc.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_lavc.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ae_pcm.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_pcm.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
 
--- a/libmpcodecs/ae_toolame.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_toolame.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ae_twolame.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ae_twolame.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/dec_audio.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/dec_audio.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/dec_video.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/dec_video.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/vd.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/vd.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/vd_internal.h	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/vd_internal.h	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/vd_libdv.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/vd_libdv.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
--- a/libmpcodecs/ve_lavc.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_lavc.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_libdv.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_libdv.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_nuv.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_nuv.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_qtvideo.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_qtvideo.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_raw.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_raw.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_vfw.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_vfw.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
 
 //===========================================================================//
 
--- a/libmpcodecs/ve_x264.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_x264.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"
--- a/libmpcodecs/ve_xvid4.c	Thu Mar 15 17:30:55 2007 +0000
+++ b/libmpcodecs/ve_xvid4.c	Thu Mar 15 17:51:32 2007 +0000
@@ -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"