diff --git a/ChangeLog b/ChangeLog index ccc4f91f53..4b6d244d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-08 Michael Smith + + * gst/typefind/gsttypefindfunctions.c: (plugin_init): + Make typefind function name for mpeg4 video unique. + 2006-03-08 Wim Taymans * ext/libvisual/visual.c: (gst_visual_init), diff --git a/common b/common index c09cd18d32..d576cc6779 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd +Subproject commit d576cc6779aa9555121d4c78ab69cc620fae3e2b diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 619846d143..73a8332bd1 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -2204,7 +2204,7 @@ plugin_init (GstPlugin * plugin) TYPE_FIND_REGISTER (plugin, "video/mpeg-stream", GST_RANK_MARGINAL, mpeg_video_stream_type_find, mpeg_video_exts, MPEG_VIDEO_CAPS, NULL, NULL); - TYPE_FIND_REGISTER (plugin, "video/mpeg", GST_RANK_PRIMARY, + TYPE_FIND_REGISTER (plugin, "video/mpeg4", GST_RANK_PRIMARY, mpeg4_video_type_find, m4v_exts, MPEG_VIDEO_CAPS, NULL, NULL); /* ISO formats */