[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[40] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[40] mplayerxp
|
From: <nic...@us...> - 2009-12-09 15:56:59
|
Revision: 40
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=40&view=rev
Author: nickols_k
Date: 2009-12-09 15:56:45 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
minor fixes and cleanups
Modified Paths:
--------------
codecs/Makefile
codecs/configure
mplayerxp/configure
mplayerxp/libmpcodecs/Makefile
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/freesdp/Makefile
mplayerxp/libmpdemux/librtsp/Makefile
mplayerxp/libmpdemux/mux_lavf.c
mplayerxp/libmpdemux/realrtsp/Makefile
mplayerxp/libmpdemux/s_ffmpeg.c
mplayerxp/libvo/Makefile
mplayerxp/osdep/Makefile
mplayerxp/postproc/Makefile
mplayerxp/postproc/libmenu/Makefile
mplayerxp/postproc/postprocess.h
mplayerxp/postproc/swscale.h
Modified: codecs/Makefile
===================================================================
--- codecs/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ codecs/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -28,7 +28,7 @@
subdirs: $(SUBDIRS)
$(SUBDIRS):
- export SUBDIR=liba52 libdca libmpeg2 mp3lib
+ export SUBDIR=ffmpeg liba52 libdca libmpeg2 mp3lib
$(MAKE) -C $@
$(LIB_NUPPELVIDEO): $(OBJ_NUPPELVIDEO)
Modified: codecs/configure
===================================================================
--- codecs/configure 2009-12-08 19:06:08 UTC (rev 39)
+++ codecs/configure 2009-12-09 15:56:45 UTC (rev 40)
@@ -199,9 +199,11 @@
;;
--enable-debug)
_debug='-g'
+ _debug_level=1
;;
--enable-debug=*)
_debug=`echo $_echo_n '-g'$_echo_c; echo $ac_option | cut -d '=' -f 2`
+ _debug_level=`echo $_echo_n echo $ac_option | cut -d '=' -f 2`
;;
--enable-mlib) mlib=yes ;;
--disable-mlib) mlib=no ;;
@@ -244,16 +246,14 @@
x86_64 && _arch="x86_64"
_ffmpeg_args="--arch=$_arch $_ffmpeg_args"
fi
+test -n $_debug_level && _ffmpeg_args="$_ffmpeg_args --enable-debug=$_debug_level"
echocheck "configuring ffmpeg stuff: --cc=\"$_cc\" $_ffmpeg_args"
cd ffmpeg
$(LC_ALL=C ./configure --cc="$_cc" $_ffmpeg_args)
cd ..
echores "done"
-_subdirs="mp3lib liba52 libdca libmpeg2"
-if test "$_ffmpeg" = yes ; then
-_subdirs="$_subdirs ffmpeg"
-fi
+_subdirs="ffmpeg mp3lib liba52 libdca libmpeg2"
cc_version=`$_cc -dumpversion`
if test "$_fastcall" = auto ; then
Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/configure 2009-12-09 15:56:45 UTC (rev 40)
@@ -563,14 +563,6 @@
_pkg_config=pkg-config
test $($_pkg_config --version 2>/dev/null) || die "no pkg-config found"
-disable ffmpeg
-# Checking for FFMPEG
-test -f "../codecs/ffmpeg/libavcodec/avcodec.h" && enable ffmpeg
-disabled ffmpeg && die "**FATAL**: local copy of libavcodec doesn't exist! Please use latest svn to checkout external repository in mplayerxp source tree."
-
-print_config HAVE_ mp_config.h mp_config.mak ffmpeg
-
-
# Checking kernel version...
if x86 && linux ; then
_k_verc_problem=no
@@ -652,6 +644,13 @@
# MAIN TESTS GO HERE #
######################
+disable ffmpeg
+# Checking for FFMPEG
+test -f "../codecs/ffmpeg/libavcodec/avcodec.h" && enable ffmpeg
+disabled ffmpeg && die "**FATAL**: local copy of libavcodec doesn't exist! Please use latest svn to checkout external repository in mplayerxp source tree."
+add_cflags "-I$_srcdir/../codecs/ffmpeg"
+print_config HAVE_ mp_config.h mp_config.mak ffmpeg
+
check_header inttypes.h || die "cannot find header inttypes.h (see in DOC/faq.html)"
require2 libdl dlfcn.h dlsym -ldl || die "dynamic loader was not found"
Modified: mplayerxp/libmpcodecs/Makefile
===================================================================
--- mplayerxp/libmpcodecs/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpcodecs/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -9,7 +9,7 @@
OBJS=$(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpdemux -I../../codecs -I../../codecs/libavutil -I../loader -Wall
+CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpdemux -I../loader -Wall
.SUFFIXES: .c .o
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2009-12-09 15:56:45 UTC (rev 40)
@@ -11,7 +11,7 @@
#include "help_mp.h"
#include "bswap.h"
-#include "../../codecs/ffmpeg/libavcodec/avcodec.h"
+#include "libavcodec/avcodec.h"
#include "codecs_ld.h"
#ifndef FF_INPUT_BUFFER_PADDING_SIZE
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2009-12-09 15:56:45 UTC (rev 40)
@@ -59,7 +59,7 @@
LIBVD_EXTERN(ffmpeg)
-#include "../../codecs/ffmpeg/libavcodec/avcodec.h"
+#include "libavcodec/avcodec.h"
#include "libvo/video_out.h"
extern char *npp_options;
Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -45,7 +45,7 @@
endif
OBJS = $(SRCS:.c=.o)
-INCLUDE = -I../loader -I../../codecs/ -I../../codecs/libavcodec -I../../codecs/libavutil
+INCLUDE = -I../loader
CFLAGS = $(OPTFLAGS) $(INCLUDE) -W -Wall
.SUFFIXES: .c .o
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/demux_lavf.c 2009-12-09 15:56:45 UTC (rev 40)
@@ -25,7 +25,7 @@
#include "stheader.h"
#include "help_mp.h"
-#include "../../codecs/ffmpeg/libavformat/avformat.h"
+#include "libavformat/avformat.h"
#include "../libmpcodecs/codecs_ld.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/freesdp/Makefile
===================================================================
--- mplayerxp/libmpdemux/freesdp/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/freesdp/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -8,7 +8,6 @@
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I../.. $(EXTRA_INC) -Wall
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/libmpdemux/librtsp/Makefile
===================================================================
--- mplayerxp/libmpdemux/librtsp/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/librtsp/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -8,7 +8,6 @@
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I../.. $(EXTRA_INC) -Wall
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/libmpdemux/mux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/mux_lavf.c 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/mux_lavf.c 2009-12-09 15:56:45 UTC (rev 40)
@@ -15,7 +15,7 @@
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "../../codecs/ffmpeg/libavformat/avformat.h"
+#include "libavformat/avformat.h"
#include "../libmpcodecs/codecs_ld.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/realrtsp/Makefile
===================================================================
--- mplayerxp/libmpdemux/realrtsp/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/realrtsp/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -11,7 +11,6 @@
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I../.. $(EXTRA_INC) -Wall
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/libmpdemux/s_ffmpeg.c
===================================================================
--- mplayerxp/libmpdemux/s_ffmpeg.c 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libmpdemux/s_ffmpeg.c 2009-12-09 15:56:45 UTC (rev 40)
@@ -1,7 +1,9 @@
-#include "config.h"
+#include "../mp_config.h"
-#include "../../codecs/ffmpeg/libavformat/avformat.h"
-#include "../../codecs/ffmpeg/libavformat/avio.h"
+#include <dlfcn.h>
+#include "libavformat/avformat.h"
+#include "libavformat/avio.h"
+#include "../libmpcodecs/codecs_ld.h"
#include "stream.h"
#include "demux_msg.h"
@@ -104,6 +106,7 @@
if (size >= 0)
stream->end_pos = size;
stream->type = STREAMTYPE_SEEKABLE;
+ stream->priv = p;
if (ctx->is_streamed) stream->type = STREAMTYPE_STREAM;
return 1;
}
Modified: mplayerxp/libvo/Makefile
===================================================================
--- mplayerxp/libvo/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/libvo/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -29,13 +29,12 @@
SRCS += vosub_vidix.c
endif
-CFLAGS = $(OPTFLAGS) -I. -I.. -I../../codecs/libavutil -DMPG12PLAY -Wall -W
+CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY -Wall -W
ifeq ($(CONFIG_VIDIX),yes)
CFLAGS += -DVIDIX_PATH='"$(LIBDIR)/vidix/"'
endif
OBJS=$(SRCS:.c=.o)
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/osdep/Makefile
===================================================================
--- mplayerxp/osdep/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/osdep/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -17,7 +17,6 @@
CFLAGS = $(OPTFLAGS) -I. -I.. -Wall
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/postproc/Makefile
===================================================================
--- mplayerxp/postproc/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/postproc/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -11,8 +11,7 @@
SRCS+=dsp.c
SRCS+=vf.c vf_vo.c vf_expand.c vf_format.c vf_yuy2.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_eq.c vf_dint.c vf_1bpp.c vf_unsharp.c vf_swapuv.c vf_il.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_denoise3d.c vf_aspect.c vf_softpulldown.c vf_delogo.c vf_yuvcsp.c vf_pp.c vf_scale.c vf_panscan.c vf_raw.c vf_ow.c vf_2xsai.c vf_framestep.c vf_menu.c
OBJS=$(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -I. -I.. -I../../codecs -I../../codecs/libavutil -Wall
-# -I/usr/X11R6/include/
+CFLAGS = $(OPTFLAGS) -I. -I.. -Wall
.SUFFIXES: .c .o
Modified: mplayerxp/postproc/libmenu/Makefile
===================================================================
--- mplayerxp/postproc/libmenu/Makefile 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/postproc/libmenu/Makefile 2009-12-09 15:56:45 UTC (rev 40)
@@ -13,7 +13,6 @@
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -I../.. $(EXTRA_INC) -Wall
-# -I/usr/X11R6/include/
.SUFFIXES: .c .o
Modified: mplayerxp/postproc/postprocess.h
===================================================================
--- mplayerxp/postproc/postprocess.h 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/postproc/postprocess.h 2009-12-09 15:56:45 UTC (rev 40)
@@ -1,5 +1,5 @@
#ifndef HAVE_PP_H
#define HAVE_PP_H 1
-#include "../../codecs/ffmpeg/libpostproc/postprocess.h"
+#include "libpostproc/postprocess.h"
#endif
Modified: mplayerxp/postproc/swscale.h
===================================================================
--- mplayerxp/postproc/swscale.h 2009-12-08 19:06:08 UTC (rev 39)
+++ mplayerxp/postproc/swscale.h 2009-12-09 15:56:45 UTC (rev 40)
@@ -22,7 +22,7 @@
#ifndef SWSCALE_H
#define SWSCALE_H
-#include "../../codecs/ffmpeg/libswscale/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
#define MODE_RGB 0x1
#define MODE_BGR 0x2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|