Commit 90a8b3fb authored by Edward Hervey's avatar Edward Hervey
Browse files

ext: ffmpeg/gstffmpeg*.[ch] => libav/gstav*.[ch]

parent 1ea0285e
...@@ -19,7 +19,7 @@ dnl check if this is a release version ...@@ -19,7 +19,7 @@ dnl check if this is a release version
AS_NANO(GST_GIT="no", GST_GIT="yes") AS_NANO(GST_GIT="no", GST_GIT="yes")
dnl can autoconf find the source ? 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 dnl define the output header for config
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
...@@ -386,7 +386,7 @@ common/Makefile ...@@ -386,7 +386,7 @@ common/Makefile
common/m4/Makefile common/m4/Makefile
gst-libav.spec gst-libav.spec
ext/Makefile ext/Makefile
ext/ffmpeg/Makefile ext/libav/Makefile
ext/libswscale/Makefile ext/libswscale/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/ext/Makefile gst-libs/ext/Makefile
......
SUBDIRS = ffmpeg libswscale SUBDIRS = libav libswscale
...@@ -6,22 +6,22 @@ else ...@@ -6,22 +6,22 @@ else
BZ2_LIBS = BZ2_LIBS =
endif endif
libgstlibav_la_SOURCES = gstffmpeg.c \ libgstlibav_la_SOURCES = gstav.c \
gstffmpegprotocol.c \ gstavprotocol.c \
gstffmpegcodecmap.c \ gstavcodecmap.c \
gstffmpegutils.c \ gstavutils.c \
gstffmpegenc.c \ gstavenc.c \
gstffmpegvidenc.c \ gstavvidenc.c \
gstffmpegdec.c \ gstavdec.c \
gstffmpegviddec.c \ gstavviddec.c \
gstffmpegcfg.c \ gstavcfg.c \
gstffmpegdemux.c \ gstavdemux.c \
gstffmpegmux.c \ gstavmux.c \
gstffmpegdeinterlace.c gstavdeinterlace.c
#\ #\
# gstffmpegaudioresample.c # gstavaudioresample.c
# \ # \
# gstffmpegscale.c # gstavscale.c
libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \ libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
...@@ -37,10 +37,10 @@ endif ...@@ -37,10 +37,10 @@ endif
noinst_HEADERS = \ noinst_HEADERS = \
gstffmpeg.h \ gstav.h \
gstffmpegcodecmap.h \ gstavcodecmap.h \
gstffmpegutils.h \ gstavutils.h \
gstffmpegenc.h \ gstavenc.h \
gstffmpegvidenc.h \ gstavvidenc.h \
gstffmpegcfg.h \ gstavcfg.h \
gstffmpegpipe.h gstavpipe.h
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
GST_DEBUG_CATEGORY (ffmpeg_debug); GST_DEBUG_CATEGORY (ffmpeg_debug);
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegvidenc.h" #include "gstavvidenc.h"
#include "gstffmpegcfg.h" #include "gstavcfg.h"
#include <string.h> #include <string.h>
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
/* Properties */ /* Properties */
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
/* #include <ffmpeg/avi.h> */ /* #include <ffmpeg/avi.h> */
#include <gst/gst.h> #include <gst/gst.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
#include "gstffmpegpipe.h" #include "gstavpipe.h"
#define MAX_STREAMS 20 #define MAX_STREAMS 20
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
#include "gstffmpegenc.h" #include "gstavenc.h"
#define DEFAULT_AUDIO_BITRATE 128000 #define DEFAULT_AUDIO_BITRATE 128000
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads.h> #include <gst/base/gstcollectpads.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegcodecmap.h" #include "gstavcodecmap.h"
#include "gstffmpegutils.h" #include "gstavutils.h"
typedef struct _GstFFMpegMux GstFFMpegMux; typedef struct _GstFFMpegMux GstFFMpegMux;
typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad; typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define __GST_FFMPEGPIPE_H__ #define __GST_FFMPEGPIPE_H__
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include "gstffmpeg.h" #include "gstav.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstffmpeg.h" #include "gstav.h"
#include "gstffmpegpipe.h" #include "gstavpipe.h"
typedef struct _GstProtocolInfo GstProtocolInfo; typedef struct _GstProtocolInfo GstProtocolInfo;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include "gstffmpegutils.h" #include "gstavutils.h"
#include <unistd.h> #include <unistd.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/sysctl.h> #include <sys/sysctl.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment