From f616f4aa7c24c681f1df9cba2a3c17850e20302d Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 14 Aug 2007 14:29:36 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Don't set rank of sp5x video decoder to NONE. Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): Don't set rank of sp5x video decoder to NONE. Fixes #466221 Re-order the cases of the switch statement so that the default case is last. --- ChangeLog | 8 ++++++++ ext/ffmpeg/gstffmpegdec.c | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f744dbdbe..b2980cc15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-08-14 Edward Hervey + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): + Don't set rank of sp5x video decoder to NONE. + Fixes #466221 + Re-order the cases of the switch statement so that the default case + is last. + 2007-08-07 Wim Taymans * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid): diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index b3e48f55fe..9c4966165d 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -2294,6 +2294,7 @@ gst_ffmpegdec_register (GstPlugin * plugin) case CODEC_ID_MPEG4: case CODEC_ID_MSMPEG4V3: case CODEC_ID_H264: + case CODEC_ID_COOK: rank = GST_RANK_PRIMARY; break; case CODEC_ID_DVVIDEO: @@ -2302,11 +2303,6 @@ gst_ffmpegdec_register (GstPlugin * plugin) note: if you change this, see the code in gstdv.c in good/ext/dv. */ rank = GST_RANK_SECONDARY; break; - default: - rank = GST_RANK_MARGINAL; - break; - /* what's that? */ - case CODEC_ID_SP5X: /* MP3 and MPEG2 have better alternatives and the ffmpeg versions don't work properly feel free to assign rank if you fix them */ @@ -2314,6 +2310,9 @@ gst_ffmpegdec_register (GstPlugin * plugin) case CODEC_ID_MPEG2VIDEO: rank = GST_RANK_NONE; break; + default: + rank = GST_RANK_MARGINAL; + break; } if (!gst_element_register (plugin, type_name, rank, type)) { g_warning ("Failed to register %s", type_name);