From 4b2f21c35143c306288cee94bf1802c2263ddbeb Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 25 Apr 2007 10:19:01 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: Remove cruft inserted by wim's last commit. Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname): Remove cruft inserted by wim's last commit. --- ChangeLog | 6 ++++++ common | 2 +- ext/ffmpeg/gstffmpegcodecmap.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5726bac..09c8141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-25 Edward Hervey + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname): + Remove cruft inserted by wim's last commit. + 2007-04-20 Michael Smith * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): diff --git a/common b/common index 765d03a..a19d235 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 765d03a88492fb4ac81d70457f671f3a109e93de +Subproject commit a19d235c89d99ca7849078d501129f521e30d98d diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 46b0241..63f15af 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -534,7 +534,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp3", NULL); break; -#ifdef CODEC_ID_VP5 case CODEC_ID_VP5: caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp5", NULL); break; @@ -546,7 +545,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, case CODEC_ID_VP6F: caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp6-flash", NULL); break; -#endif case CODEC_ID_THEORA: caps = gst_ff_vid_caps_new (context, codec_id, "video/x-theora", NULL); @@ -2135,7 +2133,6 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) } else if (!strcmp (mimetype, "video/x-vp3")) { id = CODEC_ID_VP3; video = TRUE; -#ifdef CODEC_ID_VP5 } else if (!strcmp (mimetype, "video/x-vp5")) { id = CODEC_ID_VP5; video = TRUE; @@ -2145,7 +2142,6 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) } else if (!strcmp (mimetype, "video/x-vp6-flash")) { id = CODEC_ID_VP6F; video = TRUE; -#endif } else if (!strcmp (mimetype, "video/x-flash-screen")) { id = CODEC_ID_FLASHSV; video = TRUE; @@ -2541,7 +2537,6 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id) case CODEC_ID_VP3: name = "VP3 video"; break; -#ifdef CODEC_ID_VP5 case CODEC_ID_VP5: name = "VP5 video"; break; @@ -2551,7 +2546,6 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id) case CODEC_ID_VP6F: name = "VP6 Flash video"; break; -#endif case CODEC_ID_FLASHSV: name = "Flash Screen Video"; break; -- 2.7.4