diff --git a/configure.ac b/configure.ac index 35672fab42..04a9f00fab 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl check if this is a release version AS_NANO(GST_GIT="no", GST_GIT="yes") dnl can autoconf find the source ? -AC_CONFIG_SRCDIR([ext/ffmpeg/gstffmpeg.c]) +AC_CONFIG_SRCDIR([ext/libav/gstav.c]) dnl define the output header for config AM_CONFIG_HEADER([config.h]) @@ -386,7 +386,7 @@ common/Makefile common/m4/Makefile gst-libav.spec ext/Makefile -ext/ffmpeg/Makefile +ext/libav/Makefile ext/libswscale/Makefile gst-libs/Makefile gst-libs/ext/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index acd0c1b7f8..bbdb9f0098 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1 +1 @@ -SUBDIRS = ffmpeg libswscale +SUBDIRS = libav libswscale diff --git a/ext/ffmpeg/Makefile.am b/ext/libav/Makefile.am similarity index 55% rename from ext/ffmpeg/Makefile.am rename to ext/libav/Makefile.am index ac4a7e8aa9..a5928ac97c 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/libav/Makefile.am @@ -6,22 +6,22 @@ else BZ2_LIBS = endif -libgstlibav_la_SOURCES = gstffmpeg.c \ - gstffmpegprotocol.c \ - gstffmpegcodecmap.c \ - gstffmpegutils.c \ - gstffmpegenc.c \ - gstffmpegvidenc.c \ - gstffmpegdec.c \ - gstffmpegviddec.c \ - gstffmpegcfg.c \ - gstffmpegdemux.c \ - gstffmpegmux.c \ - gstffmpegdeinterlace.c +libgstlibav_la_SOURCES = gstav.c \ + gstavprotocol.c \ + gstavcodecmap.c \ + gstavutils.c \ + gstavenc.c \ + gstavvidenc.c \ + gstavdec.c \ + gstavviddec.c \ + gstavcfg.c \ + gstavdemux.c \ + gstavmux.c \ + gstavdeinterlace.c #\ -# gstffmpegaudioresample.c +# gstavaudioresample.c # \ -# gstffmpegscale.c +# gstavscale.c libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \ @@ -37,10 +37,10 @@ endif noinst_HEADERS = \ - gstffmpeg.h \ - gstffmpegcodecmap.h \ - gstffmpegutils.h \ - gstffmpegenc.h \ - gstffmpegvidenc.h \ - gstffmpegcfg.h \ - gstffmpegpipe.h + gstav.h \ + gstavcodecmap.h \ + gstavutils.h \ + gstavenc.h \ + gstavvidenc.h \ + gstavcfg.h \ + gstavpipe.h diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/libav/gstav.c similarity index 98% rename from ext/ffmpeg/gstffmpeg.c rename to ext/libav/gstav.c index f9340d2959..8c88a13091 100644 --- a/ext/ffmpeg/gstffmpeg.c +++ b/ext/libav/gstav.c @@ -31,8 +31,8 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegutils.h" +#include "gstav.h" +#include "gstavutils.h" GST_DEBUG_CATEGORY (ffmpeg_debug); diff --git a/ext/ffmpeg/gstffmpeg.h b/ext/libav/gstav.h similarity index 100% rename from ext/ffmpeg/gstffmpeg.h rename to ext/libav/gstav.h diff --git a/ext/ffmpeg/gstffmpegaudioresample.c b/ext/libav/gstavaudioresample.c similarity index 100% rename from ext/ffmpeg/gstffmpegaudioresample.c rename to ext/libav/gstavaudioresample.c diff --git a/ext/ffmpeg/gstffmpegcfg.c b/ext/libav/gstavcfg.c similarity index 99% rename from ext/ffmpeg/gstffmpegcfg.c rename to ext/libav/gstavcfg.c index 99390be82c..5ee23dd44b 100644 --- a/ext/ffmpeg/gstffmpegcfg.c +++ b/ext/libav/gstavcfg.c @@ -25,9 +25,9 @@ #include "config.h" #endif -#include "gstffmpeg.h" -#include "gstffmpegvidenc.h" -#include "gstffmpegcfg.h" +#include "gstav.h" +#include "gstavvidenc.h" +#include "gstavcfg.h" #include diff --git a/ext/ffmpeg/gstffmpegcfg.h b/ext/libav/gstavcfg.h similarity index 100% rename from ext/ffmpeg/gstffmpegcfg.h rename to ext/libav/gstavcfg.h diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/libav/gstavcodecmap.c similarity index 99% rename from ext/ffmpeg/gstffmpegcodecmap.c rename to ext/libav/gstavcodecmap.c index 553b780e2c..51f8873f88 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/libav/gstavcodecmap.c @@ -28,8 +28,8 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" +#include "gstav.h" +#include "gstavcodecmap.h" #include #include diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/libav/gstavcodecmap.h similarity index 100% rename from ext/ffmpeg/gstffmpegcodecmap.h rename to ext/libav/gstavcodecmap.h diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/libav/gstavdec.c similarity index 99% rename from ext/ffmpeg/gstffmpegdec.c rename to ext/libav/gstavdec.c index 813f39c3ae..8291099467 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/libav/gstavdec.c @@ -28,9 +28,9 @@ #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/libav/gstavdeinterlace.c similarity index 99% rename from ext/ffmpeg/gstffmpegdeinterlace.c rename to ext/libav/gstavdeinterlace.c index 04ae9ab70d..65961f6a83 100644 --- a/ext/ffmpeg/gstffmpegdeinterlace.c +++ b/ext/libav/gstavdeinterlace.c @@ -29,9 +29,9 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" /* Properties */ diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/libav/gstavdemux.c similarity index 99% rename from ext/ffmpeg/gstffmpegdemux.c rename to ext/libav/gstavdemux.c index caf38e0829..99beddac95 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/libav/gstavdemux.c @@ -29,10 +29,10 @@ /* #include */ #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" -#include "gstffmpegpipe.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" +#include "gstavpipe.h" #define MAX_STREAMS 20 diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/libav/gstavenc.c similarity index 99% rename from ext/ffmpeg/gstffmpegenc.c rename to ext/libav/gstavenc.c index 8052b44a59..312787e768 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/libav/gstavenc.c @@ -32,10 +32,10 @@ #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" -#include "gstffmpegenc.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" +#include "gstavenc.h" #define DEFAULT_AUDIO_BITRATE 128000 diff --git a/ext/ffmpeg/gstffmpegenc.h b/ext/libav/gstavenc.h similarity index 100% rename from ext/ffmpeg/gstffmpegenc.h rename to ext/libav/gstavenc.h diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/libav/gstavmux.c similarity index 99% rename from ext/ffmpeg/gstffmpegmux.c rename to ext/libav/gstavmux.c index a8186b7ace..f54fb00c98 100644 --- a/ext/ffmpeg/gstffmpegmux.c +++ b/ext/libav/gstavmux.c @@ -27,9 +27,9 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" typedef struct _GstFFMpegMux GstFFMpegMux; typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad; diff --git a/ext/ffmpeg/gstffmpegpipe.h b/ext/libav/gstavpipe.h similarity index 99% rename from ext/ffmpeg/gstffmpegpipe.h rename to ext/libav/gstavpipe.h index a2515f3449..1bcbc14384 100644 --- a/ext/ffmpeg/gstffmpegpipe.h +++ b/ext/libav/gstavpipe.h @@ -22,7 +22,7 @@ #define __GST_FFMPEGPIPE_H__ #include -#include "gstffmpeg.h" +#include "gstav.h" G_BEGIN_DECLS diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/libav/gstavprotocol.c similarity index 99% rename from ext/ffmpeg/gstffmpegprotocol.c rename to ext/libav/gstavprotocol.c index 0ec667261c..9c4b052a92 100644 --- a/ext/ffmpeg/gstffmpegprotocol.c +++ b/ext/libav/gstavprotocol.c @@ -28,8 +28,8 @@ #include -#include "gstffmpeg.h" -#include "gstffmpegpipe.h" +#include "gstav.h" +#include "gstavpipe.h" typedef struct _GstProtocolInfo GstProtocolInfo; diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/libav/gstavscale.c similarity index 100% rename from ext/ffmpeg/gstffmpegscale.c rename to ext/libav/gstavscale.c diff --git a/ext/ffmpeg/gstffmpegutils.c b/ext/libav/gstavutils.c similarity index 99% rename from ext/ffmpeg/gstffmpegutils.c rename to ext/libav/gstavutils.c index 23e17ad3f7..687f01d77a 100644 --- a/ext/ffmpeg/gstffmpegutils.c +++ b/ext/libav/gstavutils.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "gstffmpegutils.h" +#include "gstavutils.h" #include #ifdef __APPLE__ #include diff --git a/ext/ffmpeg/gstffmpegutils.h b/ext/libav/gstavutils.h similarity index 100% rename from ext/ffmpeg/gstffmpegutils.h rename to ext/libav/gstavutils.h diff --git a/ext/ffmpeg/gstffmpegviddec.c b/ext/libav/gstavviddec.c similarity index 99% rename from ext/ffmpeg/gstffmpegviddec.c rename to ext/libav/gstavviddec.c index e57fa814a2..00fd7e4659 100644 --- a/ext/ffmpeg/gstffmpegviddec.c +++ b/ext/libav/gstavviddec.c @@ -32,9 +32,9 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); diff --git a/ext/ffmpeg/gstffmpegvidenc.c b/ext/libav/gstavvidenc.c similarity index 99% rename from ext/ffmpeg/gstffmpegvidenc.c rename to ext/libav/gstavvidenc.c index 145b195582..5f81464e2b 100644 --- a/ext/ffmpeg/gstffmpegvidenc.c +++ b/ext/libav/gstavvidenc.c @@ -33,11 +33,11 @@ #include #include -#include "gstffmpeg.h" -#include "gstffmpegcodecmap.h" -#include "gstffmpegutils.h" -#include "gstffmpegvidenc.h" -#include "gstffmpegcfg.h" +#include "gstav.h" +#include "gstavcodecmap.h" +#include "gstavutils.h" +#include "gstavvidenc.h" +#include "gstavcfg.h" #define DEFAULT_VIDEO_BITRATE 300000 /* in bps */ #define DEFAULT_VIDEO_GOP_SIZE 15 diff --git a/ext/ffmpeg/gstffmpegvidenc.h b/ext/libav/gstavvidenc.h similarity index 100% rename from ext/ffmpeg/gstffmpegvidenc.h rename to ext/libav/gstavvidenc.h