diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libav/gstavcodecmap.c | 35 | ||||
| -rw-r--r-- | ext/libav/gstavcodecmap.h | 18 |
2 files changed, 2 insertions, 51 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c index ab59686..ed9d421 100644 --- a/ext/libav/gstavcodecmap.c +++ b/ext/libav/gstavcodecmap.c @@ -850,8 +850,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, case CODEC_ID_RAWVIDEO: caps = - gst_ffmpeg_codectype_to_caps (AVMEDIA_TYPE_VIDEO, context, codec_id, - encode); + gst_ffmpeg_codectype_to_video_caps (context, codec_id, encode, NULL); break; case CODEC_ID_MSMPEG4V1: @@ -1914,7 +1913,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, * See below for usefullness */ -GstCaps * +static GstCaps * gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, enum CodecID codec_id) { @@ -2134,36 +2133,6 @@ gst_ffmpeg_codectype_to_video_caps (AVCodecContext * context, return caps; } -/* Convert a FFMPEG codec Type and optional AVCodecContext - * to a GstCaps. If the context is ommitted, no fixed values - * for video/audio size will be included in the GstCaps - * - * AVMediaType is primarily meant for uncompressed data GstCaps! - */ - -GstCaps * -gst_ffmpeg_codectype_to_caps (enum AVMediaType codec_type, - AVCodecContext * context, enum CodecID codec_id, gboolean encode) -{ - GstCaps *caps; - - switch (codec_type) { - case AVMEDIA_TYPE_VIDEO: - caps = - gst_ffmpeg_codectype_to_video_caps (context, codec_id, encode, NULL); - break; - case AVMEDIA_TYPE_AUDIO: - caps = - gst_ffmpeg_codectype_to_audio_caps (context, codec_id, encode, NULL); - break; - default: - caps = NULL; - break; - } - - return caps; -} - /* Convert a GstCaps (audio/raw) to a FFMPEG SampleFmt * and other audio properties in a AVCodecContext. * diff --git a/ext/libav/gstavcodecmap.h b/ext/libav/gstavcodecmap.h index fd2d430..01ce9b1 100644 --- a/ext/libav/gstavcodecmap.h +++ b/ext/libav/gstavcodecmap.h @@ -41,11 +41,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, */ GstCaps * -gst_ffmpeg_codectype_to_caps (enum AVMediaType codec_type, - AVCodecContext *context, - enum CodecID codec_id, - gboolean encode); -GstCaps * gst_ffmpeg_codectype_to_audio_caps (AVCodecContext *context, enum CodecID codec_id, gboolean encode, @@ -110,19 +105,6 @@ GstAudioFormat gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt) GstCaps * gst_ffmpeg_formatid_to_caps (const gchar *format_name); -GstVideoFormat -gst_ffmpeg_pixfmt_to_video_format (enum PixelFormat pix_fmt); - -/* Convert a FFMPEG Pixel Format and optional AVCodecContext - * to a GstCaps. If the context is ommitted, no fixed values - * for video/audio size will be included in the GstCaps - * - * See below for usefullness - */ - -GstCaps * -gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, enum CodecID codec_id); - /* * _formatid_get_codecids () can be used to get the codecIDs * (CODEC_ID_NONE-terminated list) that fit that specific |