Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv3720 Modified Files: Makefile mencoder.c mplayer.c Log Message: mp_image.h and img_format.h moved to libmpcodecs Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- Makefile 13 Apr 2002 18:04:23 -0000 1.174 +++ Makefile 13 Apr 2002 19:14:31 -0000 1.175 @@ -38,7 +38,7 @@ INSTALL = install SRCS_COMMON = xacodec.c cpudetect.c mp_msg.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c -SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c +SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c me-opt-reg.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- mencoder.c 12 Apr 2002 21:50:38 -0000 1.116 +++ mencoder.c 13 Apr 2002 19:14:31 -0000 1.117 @@ -42,8 +42,8 @@ #include "libvo/video_out.h" -#include "dec_audio.h" -#include "dec_video.h" +#include "libmpcodecs/dec_audio.h" +#include "libmpcodecs/dec_video.h" #ifdef HAVE_MP3LAME #include <lame/lame.h> Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.463 retrieving revision 1.464 diff -u -r1.463 -r1.464 --- mplayer.c 12 Apr 2002 10:40:37 -0000 1.463 +++ mplayer.c 13 Apr 2002 19:14:31 -0000 1.464 @@ -140,8 +140,8 @@ #include "stheader.h" #include "parse_es.h" -#include "dec_audio.h" -#include "dec_video.h" +#include "libmpcodecs/dec_audio.h" +#include "libmpcodecs/dec_video.h" //**************************************************************************// //**************************************************************************//