Commit 1409e169 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

av: Update for CodecID -> AVCodecID related changes

parent fc57f7fb
This diff is collapsed.
......@@ -73,7 +73,7 @@ gst_ffmpeg_compliance_get_type (void);
*/
GstCaps *
gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
AVCodecContext *context,
gboolean encode);
......@@ -84,12 +84,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
GstCaps *
gst_ffmpeg_codectype_to_audio_caps (AVCodecContext *context,
enum CodecID codec_id,
enum AVCodecID codec_id,
gboolean encode,
AVCodec *codec);
GstCaps *
gst_ffmpeg_codectype_to_video_caps (AVCodecContext *context,
enum CodecID codec_id,
enum AVCodecID codec_id,
gboolean encode,
AVCodec *codec);
......@@ -99,7 +99,7 @@ gst_ffmpeg_codectype_to_video_caps (AVCodecContext *context,
* context and a codecID.
*/
enum CodecID
enum AVCodecID
gst_ffmpeg_caps_to_codecid (const GstCaps *caps,
AVCodecContext *context);
......@@ -109,7 +109,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps *caps,
*/
void
gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
enum AVMediaType codec_type,
const GstCaps *caps,
AVCodecContext *context);
......@@ -155,8 +155,8 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name);
gboolean
gst_ffmpeg_formatid_get_codecids (const gchar *format_name,
enum CodecID ** video_codec_list,
enum CodecID ** audio_codec_list,
enum AVCodecID ** video_codec_list,
enum AVCodecID ** audio_codec_list,
AVOutputFormat * plugin);
......
......@@ -120,7 +120,7 @@ static void gst_ffmpegmux_set_property (GObject * object, guint prop_id,
static void gst_ffmpegmux_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static GstCaps *gst_ffmpegmux_get_id_caps (enum CodecID *id_list);
static GstCaps *gst_ffmpegmux_get_id_caps (enum AVCodecID *id_list);
static void gst_ffmpeg_mux_simple_caps_set_int_list (GstCaps * caps,
const gchar * field, guint num, const gint * values);
......@@ -193,7 +193,7 @@ gst_ffmpegmux_base_init (gpointer g_class)
GstPadTemplate *videosinktempl, *audiosinktempl, *srctempl;
AVOutputFormat *in_plugin;
GstCaps *srccaps, *audiosinkcaps, *videosinkcaps;
enum CodecID *video_ids = NULL, *audio_ids = NULL;
enum AVCodecID *video_ids = NULL, *audio_ids = NULL;
gchar *longname, *description;
const char *replacement;
gboolean is_formatter;
......@@ -819,7 +819,7 @@ gst_ffmpegmux_change_state (GstElement * element, GstStateChange transition)
}
static GstCaps *
gst_ffmpegmux_get_id_caps (enum CodecID *id_list)
gst_ffmpegmux_get_id_caps (enum AVCodecID *id_list)
{
GstCaps *caps, *t;
gint i;
......
......@@ -32,7 +32,7 @@
#include <libavutil/mem.h>
G_CONST_RETURN gchar *
gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id)
{
AVCodec *codec;
/* Let's use what ffmpeg can provide us */
......
......@@ -86,7 +86,7 @@ int
gst_ffmpeg_auto_max_threads(void);
G_CONST_RETURN gchar *
gst_ffmpeg_get_codecid_longname (enum CodecID codec_id);
gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id);
gint
av_smp_format_depth(enum AVSampleFormat smp_fmt);
......
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