Author: gkovacs Date: Thu Aug 20 17:20:09 2009 New Revision: 5202 Log: rename playlist.h to avplaylist.h
Modified: concat/ffmpeg.c.diff concat/ffplay.c.diff concat/libavformat/Makefile.diff concat/libavformat/avplaylist.c concat/libavformat/concatgen.h concat/libavformat/utils.c.diff Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Thu Aug 20 16:59:35 2009 (r5201) +++ concat/ffmpeg.c.diff Thu Aug 20 17:20:09 2009 (r5202) @@ -1,12 +1,12 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 2686e1d..5b2af7e 100644 +index 2686e1d..28b025e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -40,6 +40,7 @@ #include "libavutil/fifo.h" #include "libavutil/avstring.h" #include "libavformat/os_support.h" -+#include "libavformat/playlist.h" ++#include "libavformat/avplaylist.h" #if HAVE_SYS_RESOURCE_H #include <sys/types.h> Modified: concat/ffplay.c.diff ============================================================================== --- concat/ffplay.c.diff Thu Aug 20 16:59:35 2009 (r5201) +++ concat/ffplay.c.diff Thu Aug 20 17:20:09 2009 (r5202) @@ -1,12 +1,12 @@ diff --git a/ffplay.c b/ffplay.c -index 814efc5..5e917ac 100644 +index 814efc5..f5766a0 100644 --- a/ffplay.c +++ b/ffplay.c @@ -29,6 +29,8 @@ #include "libavcodec/colorspace.h" #include "libavcodec/opt.h" -+#include "libavformat/playlist.h" ++#include "libavformat/avplaylist.h" + #include "cmdutils.h" Modified: concat/libavformat/Makefile.diff ============================================================================== --- concat/libavformat/Makefile.diff Thu Aug 20 16:59:35 2009 (r5201) +++ concat/libavformat/Makefile.diff Thu Aug 20 17:20:09 2009 (r5202) @@ -1,12 +1,21 @@ diff --git a/libavformat/Makefile b/libavformat/Makefile -index 86dc03f..8a6ecd9 100644 +index 86dc03f..5629202 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile +@@ -3,7 +3,7 @@ include $(SUBDIR)../config.mak + NAME = avformat + FFLIBS = avcodec avutil + +-HEADERS = avformat.h avio.h ++HEADERS = avformat.h avio.h avplaylist.h + + OBJS = allformats.o cutils.o metadata.o metadata_compat.o options.o os_support.o sdp.o utils.o + @@ -33,6 +33,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o -+OBJS-$(CONFIG_CONCAT_DEMUXER) += playlist.o concat.o concatgen.o ++OBJS-$(CONFIG_CONCAT_DEMUXER) += avplaylist.o concat.o concatgen.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o OBJS-$(CONFIG_DAUD_MUXER) += daud.o @@ -14,7 +23,7 @@ index 86dc03f..8a6ecd9 100644 OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o -+OBJS-$(CONFIG_M3U_DEMUXER) += m3u.o playlist.o concatgen.o ++OBJS-$(CONFIG_M3U_DEMUXER) += m3u.o avplaylist.o concatgen.o OBJS-$(CONFIG_M4V_DEMUXER) += raw.o OBJS-$(CONFIG_M4V_MUXER) += raw.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o riff.o isom.o @@ -22,7 +31,7 @@ index 86dc03f..8a6ecd9 100644 OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o -+OBJS-$(CONFIG_PLS_DEMUXER) += pls.o playlist.o concatgen.o ++OBJS-$(CONFIG_PLS_DEMUXER) += pls.o avplaylist.o concatgen.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o @@ -30,7 +39,7 @@ index 86dc03f..8a6ecd9 100644 OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o OBJS-$(CONFIG_WV_DEMUXER) += wv.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o -+OBJS-$(CONFIG_XSPF_DEMUXER) += xspf.o playlist.o concatgen.o ++OBJS-$(CONFIG_XSPF_DEMUXER) += xspf.o avplaylist.o concatgen.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Thu Aug 20 16:59:35 2009 (r5201) +++ concat/libavformat/avplaylist.c Thu Aug 20 17:20:09 2009 (r5202) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** @file libavformat/playlist.c +/** @file libavformat/avplaylist.c * @author Geza Kovacs ( gkovacs mit edu ) * * @brief General components used by playlist formats @@ -30,7 +30,7 @@ * implementing file concatenation and support for playlist formats. */ -#include "playlist.h" +#include "libavformat/avplaylist.h" #include "riff.h" #include "libavutil/avstring.h" #include "internal.h" Modified: concat/libavformat/concatgen.h ============================================================================== --- concat/libavformat/concatgen.h Thu Aug 20 16:59:35 2009 (r5201) +++ concat/libavformat/concatgen.h Thu Aug 20 17:20:09 2009 (r5202) @@ -22,7 +22,7 @@ #ifndef AVFORMAT_CONCATGEN_H #define AVFORMAT_CONCATGEN_H -#include "playlist.h" +#include "libavformat/avplaylist.h" int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); Modified: concat/libavformat/utils.c.diff ============================================================================== --- concat/libavformat/utils.c.diff Thu Aug 20 16:59:35 2009 (r5201) +++ concat/libavformat/utils.c.diff Thu Aug 20 17:20:09 2009 (r5202) @@ -1,12 +1,12 @@ diff --git a/libavformat/utils.c b/libavformat/utils.c -index b9f6c00..7f03651 100644 +index b9f6c00..74e2f71 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -27,6 +27,7 @@ #include <sys/time.h> #include <time.h> #include <strings.h> -+#include "playlist.h" ++#include "libavformat/avplaylist.h" #undef NDEBUG #include <assert.h> _______________________________________________ FFmpeg-soc mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
