Commit 0403bd43 authored by Ronald S. Bultje's avatar Ronald S. Bultje

ext/ffmpeg/: Re-add H263I as intel-h263 (which is not h263-compliant...).

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
Re-add H263I as intel-h263 (which is not h263-compliant...).
Increase rank of mpeg2video since it plays more videos than
its gst-plugins counterpart, with no regressions.
parent beb5886d
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
Re-add H263I as intel-h263 (which is not h263-compliant...).
Increase rank of mpeg2video since it plays more videos than
its gst-plugins counterpart, with no regressions.
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):
......
......@@ -165,10 +165,13 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
/* I don't know the exact differences between those... Anyone? */
case CODEC_ID_H263:
case CODEC_ID_H263P:
case CODEC_ID_H263I:
caps = GST_FF_VID_CAPS_NEW ("video/x-h263", NULL);
break;
case CODEC_ID_H263I:
caps = GST_FF_VID_CAPS_NEW ("video/x-intel-h263", NULL);
break;
case CODEC_ID_H261:
caps = GST_FF_VID_CAPS_NEW ("video/x-h261", NULL);
break;
......@@ -1389,7 +1392,10 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
id = CODEC_ID_DVAUDIO;
audio = TRUE;
} else if (!strcmp (mimetype, "video/x-h263")) {
id = CODEC_ID_H263; /* or H263[IP] */
id = CODEC_ID_H263; /* or H263P */
video = TRUE;
} else if (!strcmp (mimetype, "video/x-intel-h263")) {
id = CODEC_ID_H263I;
video = TRUE;
} else if (!strcmp (mimetype, "video/x-h261")) {
id = CODEC_ID_H261;
......@@ -1802,7 +1808,7 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
name = "H.263 (P) video";
break;
case CODEC_ID_H263I:
name = "H.263 (I) video";
name = "Intel H.263 video";
break;
case CODEC_ID_FLV1:
name = "FLV video";
......
......@@ -891,13 +891,11 @@ gst_ffmpegdec_register (GstPlugin * plugin)
* and use rank=none for H263I for now, until I know what the diff
* is. */
switch (in_plugin->id) {
case CODEC_ID_MPEG2VIDEO:
case CODEC_ID_MPEG4:
case CODEC_ID_MSMPEG4V3:
rank = GST_RANK_PRIMARY;
break;
case CODEC_ID_H263I:
rank = GST_RANK_NONE;
break;
default:
rank = GST_RANK_MARGINAL;
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment