summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-08-22 14:23:12 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-08-22 14:23:43 +0200
commit966b53109b7f933ead596f9075d26bd6713f36d3 (patch)
treebbf22923faa53873c4b00d3563e75c16cfbd7371
parentffe85cb0ef0c18162f9baa098c991e227d98c926 (diff)
avdemux: Add support for video/x-pva
https://bugzilla.gnome.org/show_bug.cgi?id=158719
-rw-r--r--ext/libav/gstavcodecmap.c14
-rw-r--r--ext/libav/gstavdemux.c2
2 files changed, 16 insertions, 0 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 88d19a0..f705f34 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -3080,6 +3080,8 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
caps = gst_caps_from_string ("video/webm");
} else if (!strcmp (format_name, "voc")) {
caps = gst_caps_from_string ("audio/x-voc");
+ } else if (!strcmp (format_name, "pva")) {
+ caps = gst_caps_from_string ("video/x-pva");
} else {
gchar *name;
@@ -3258,6 +3260,18 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
*video_codec_list = tmp_vlist;
*audio_codec_list = tmp_alist;
+ } else if ((!strcmp (format_name, "pva"))) {
+ static enum CodecID tgp_video_list[] = {
+ AV_CODEC_ID_MPEG2VIDEO,
+ AV_CODEC_ID_NONE
+ };
+ static enum CodecID tgp_audio_list[] = {
+ AV_CODEC_ID_MP2,
+ AV_CODEC_ID_NONE
+ };
+
+ *video_codec_list = tgp_video_list;
+ *audio_codec_list = tgp_audio_list;
} else {
GST_LOG ("Format %s not found", format_name);
return FALSE;
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index d0df524..74e4a39 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -2003,6 +2003,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "nuv") ||
!strcmp (in_plugin->name, "swf") ||
!strcmp (in_plugin->name, "voc") ||
+ !strcmp (in_plugin->name, "pva") ||
!strcmp (in_plugin->name, "gif") || !strcmp (in_plugin->name, "vc1test")
)
register_typefind_func = FALSE;
@@ -2039,6 +2040,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "aiff") ||
!strcmp (in_plugin->name, "4xm") ||
!strcmp (in_plugin->name, "yuv4mpegpipe") ||
+ !strcmp (in_plugin->name, "pva") ||
!strcmp (in_plugin->name, "mpc") || !strcmp (in_plugin->name, "gif"))
rank = GST_RANK_MARGINAL;
else {