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

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

parent 1ea0285e
......@@ -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
......
SUBDIRS = ffmpeg libswscale
SUBDIRS = libav libswscale
......@@ -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
......@@ -31,8 +31,8 @@
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include "gstffmpeg.h"
#include "gstffmpegutils.h"
#include "gstav.h"
#include "gstavutils.h"
GST_DEBUG_CATEGORY (ffmpeg_debug);
......
......@@ -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 <string.h>
......
......@@ -28,8 +28,8 @@
#include <gst/gst.h>
#include <libavcodec/avcodec.h>
#include "gstffmpeg.h"
#include "gstffmpegcodecmap.h"
#include "gstav.h"
#include "gstavcodecmap.h"
#include <gst/video/video.h>
#include <gst/audio/audio.h>
......
......@@ -28,9 +28,9 @@
#include <gst/gst.h>
#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);
......
......@@ -29,9 +29,9 @@
#include <gst/gst.h>
#include <gst/video/video.h>
#include "gstffmpeg.h"
#include "gstffmpegcodecmap.h"
#include "gstffmpegutils.h"
#include "gstav.h"
#include "gstavcodecmap.h"
#include "gstavutils.h"
/* Properties */
......
......@@ -29,10 +29,10 @@
/* #include <ffmpeg/avi.h> */
#include <gst/gst.h>
#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
......
......@@ -32,10 +32,10 @@
#include <gst/gst.h>
#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
......
......@@ -27,9 +27,9 @@
#include <gst/gst.h>
#include <gst/base/gstcollectpads.h>
#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;
......
......@@ -22,7 +22,7 @@
#define __GST_FFMPEGPIPE_H__
#include <gst/base/gstadapter.h>
#include "gstffmpeg.h"
#include "gstav.h"
G_BEGIN_DECLS
......
......@@ -28,8 +28,8 @@
#include <gst/gst.h>
#include "gstffmpeg.h"
#include "gstffmpegpipe.h"
#include "gstav.h"
#include "gstavpipe.h"
typedef struct _GstProtocolInfo GstProtocolInfo;
......
......@@ -20,7 +20,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstffmpegutils.h"
#include "gstavutils.h"
#include <unistd.h>
#ifdef __APPLE__
#include <sys/sysctl.h>
......
......@@ -32,9 +32,9 @@
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>
#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);
......
......@@ -33,11 +33,11 @@
#include <gst/gst.h>
#include <gst/video/gstvideometa.h>
#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
......
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