[MPlayer-cvslog] r32544 - in trunk: Makefile av_sub.c av_sub.h mpcommon.c sub/av_sub.c sub/av_sub.h
cigaes
subversion at mplayerhq.hu
Wed Oct 27 18:42:23 CEST 2010
Author: cigaes
Date: Wed Oct 27 18:42:23 2010
New Revision: 32544
Log:
Move av_sub.[ch] to the sub directory.
Added:
trunk/sub/av_sub.c
- copied, changed from r32543, trunk/av_sub.c
trunk/sub/av_sub.h
- copied unchanged from r32541, trunk/av_sub.h
Deleted:
trunk/av_sub.c
trunk/av_sub.h
Modified:
trunk/Makefile
trunk/mpcommon.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Wed Oct 27 18:38:51 2010 (r32543)
+++ trunk/Makefile Wed Oct 27 18:42:23 2010 (r32544)
@@ -99,7 +99,6 @@ SRCS_COMMON-$(FAAD_INTERNAL) +=
SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
SRCS_COMMON-$(FFMPEG) += av_opts.c \
- av_sub.c \
libaf/af_lavcresample.c \
libmpcodecs/ad_ffmpeg.c \
libmpcodecs/vd_ffmpeg.c \
@@ -109,6 +108,7 @@ SRCS_COMMON-$(FFMPEG) +=
libmpcodecs/vf_screenshot.c \
libmpdemux/demux_lavf.c \
stream/stream_ffmpeg.c \
+ sub/av_sub.c \
# These filters use private headers and do not work with shared FFmpeg.
SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \
Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c Wed Oct 27 18:38:51 2010 (r32543)
+++ trunk/mpcommon.c Wed Oct 27 18:42:23 2010 (r32544)
@@ -37,7 +37,7 @@
#include "sub/spudec.h"
#include "version.h"
#include "vobsub.h"
-#include "av_sub.h"
+#include "sub/av_sub.h"
#include "libmpcodecs/dec_teletext.h"
#include "libavutil/intreadwrite.h"
#include "m_option.h"
Copied and modified: trunk/sub/av_sub.c (from r32543, trunk/av_sub.c)
==============================================================================
--- trunk/av_sub.c Wed Oct 27 18:38:51 2010 (r32543, copy source)
+++ trunk/sub/av_sub.c Wed Oct 27 18:42:23 2010 (r32544)
@@ -20,7 +20,7 @@
#include "libmpdemux/stheader.h"
#include "libvo/sub.h"
#include "sub/spudec.h"
-#include "av_sub.h"
+#include "sub/av_sub.h"
void reset_avsub(struct sh_sub *sh)
{
More information about the MPlayer-cvslog
mailing list