mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

avaudenc: further cleanup

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=792900
This commit is contained in:
Mathieu Duponchelle 2018-06-30 23:28:31 +02:00
parent 59b9e66542
commit 8f3bc07e09
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/libav/gstavaudenc.c
View file

@ -41,21 +41,12 @@
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavaudenc.h" #include "gstavaudenc.h"
#define DEFAULT_AUDIO_BITRATE 128000
enum
{
/* FILL ME */
LAST_SIGNAL
};
enum enum
{ {
PROP_0, PROP_0,
PROP_CFG_BASE, PROP_CFG_BASE,
}; };
/* A number of function prototypes are given so we can refer to them later. */
static void gst_ffmpegaudenc_class_init (GstFFMpegAudEncClass * klass); static void gst_ffmpegaudenc_class_init (GstFFMpegAudEncClass * klass);
static void gst_ffmpegaudenc_base_init (GstFFMpegAudEncClass * klass); static void gst_ffmpegaudenc_base_init (GstFFMpegAudEncClass * klass);
static void gst_ffmpegaudenc_init (GstFFMpegAudEnc * ffmpegaudenc); static void gst_ffmpegaudenc_init (GstFFMpegAudEnc * ffmpegaudenc);
@ -78,8 +69,6 @@ static void gst_ffmpegaudenc_get_property (GObject * object,
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
/*static guint gst_ffmpegaudenc_signals[LAST_SIGNAL] = { 0 }; */
static void static void
gst_ffmpegaudenc_base_init (GstFFMpegAudEncClass * klass) gst_ffmpegaudenc_base_init (GstFFMpegAudEncClass * klass)
{ {
@ -676,7 +665,7 @@ gst_ffmpegaudenc_set_property (GObject * object,
if (ffmpegaudenc->opened) { if (ffmpegaudenc->opened) {
GST_WARNING_OBJECT (ffmpegaudenc, GST_WARNING_OBJECT (ffmpegaudenc,
"Can't change properties once decoder is setup !"); "Can't change properties once encoder is setup !");
return; return;
} }
@ -738,13 +727,7 @@ gst_ffmpegaudenc_register (GstPlugin * plugin)
(in_plugin->id >= AV_CODEC_ID_PCM_S16LE && (in_plugin->id >= AV_CODEC_ID_PCM_S16LE &&
in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) || in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) ||
(in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR && (in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR &&
#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,69,0)
in_plugin->id <= AV_CODEC_ID_PCM_F24LE)) { in_plugin->id <= AV_CODEC_ID_PCM_F24LE)) {
#elif AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,54,0)
in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) {
#else
in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) {
#endif
continue; continue;
} }