mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegcodecmap.c: Remove cruft inserted by wim's last commit.

Browse source 
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.
This commit is contained in:
Edward Hervey 2007-04-25 10:19:01 +00:00
parent 357aa01ac6
commit 4b2f21c351
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-04-25 Edward Hervey <edward@fluendo.com>
* 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 <msmith@fluendo.com> 2007-04-20 Michael Smith <msmith@fluendo.com>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find):

2
common

@ -1 +1 @@
Subproject commit 765d03a88492fb4ac81d70457f671f3a109e93de Subproject commit a19d235c89d99ca7849078d501129f521e30d98d

6
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -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); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp3", NULL);
break; break;
#ifdef CODEC_ID_VP5
case CODEC_ID_VP5: case CODEC_ID_VP5:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp5", NULL); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp5", NULL);
break; break;
@ -546,7 +545,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_VP6F: case CODEC_ID_VP6F:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp6-flash", NULL); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp6-flash", NULL);
break; break;
#endif
case CODEC_ID_THEORA: case CODEC_ID_THEORA:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-theora", NULL); 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")) { } else if (!strcmp (mimetype, "video/x-vp3")) {
id = CODEC_ID_VP3; id = CODEC_ID_VP3;
video = TRUE; video = TRUE;
#ifdef CODEC_ID_VP5
} else if (!strcmp (mimetype, "video/x-vp5")) { } else if (!strcmp (mimetype, "video/x-vp5")) {
id = CODEC_ID_VP5; id = CODEC_ID_VP5;
video = TRUE; video = TRUE;
@ -2145,7 +2142,6 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
} else if (!strcmp (mimetype, "video/x-vp6-flash")) { } else if (!strcmp (mimetype, "video/x-vp6-flash")) {
id = CODEC_ID_VP6F; id = CODEC_ID_VP6F;
video = TRUE; video = TRUE;
#endif
} else if (!strcmp (mimetype, "video/x-flash-screen")) { } else if (!strcmp (mimetype, "video/x-flash-screen")) {
id = CODEC_ID_FLASHSV; id = CODEC_ID_FLASHSV;
video = TRUE; video = TRUE;
@ -2541,7 +2537,6 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
case CODEC_ID_VP3: case CODEC_ID_VP3:
name = "VP3 video"; name = "VP3 video";
break; break;
#ifdef CODEC_ID_VP5
case CODEC_ID_VP5: case CODEC_ID_VP5:
name = "VP5 video"; name = "VP5 video";
break; break;
@ -2551,7 +2546,6 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
case CODEC_ID_VP6F: case CODEC_ID_VP6F:
name = "VP6 Flash video"; name = "VP6 Flash video";
break; break;
#endif
case CODEC_ID_FLASHSV: case CODEC_ID_FLASHSV:
name = "Flash Screen Video"; name = "Flash Screen Video";
break; break;