From: <rb...@fr...> - 2004-10-04 16:11:47
|
CVS Root: /home/cvs/gstreamer Module: gst-ffmpeg Changes by: rbultje Date: Mon Oct 04 2004 09:11:42 PDT Log message: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_with_codecid): Negotiation fixes for real video codecs. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcodecmap.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.77&r2=1.78 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.61&r2=1.62 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- ChangeLog 2 Oct 2004 21:17:26 -0000 1.77 +++ ChangeLog 4 Oct 2004 16:11:30 -0000 1.78 @@ -1,3 +1,9 @@ +2004-10-04 Ronald S. Bultje <rb...@ro...> + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_caps_with_codecid): + Negotiation fixes for real video codecs. 2004-10-02 Ronald S. Bultje <rb...@ro...> * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): Index: gstffmpegcodecmap.c RCS file: /home/cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- gstffmpegcodecmap.c 2 Oct 2004 20:26:10 -0000 1.61 +++ gstffmpegcodecmap.c 4 Oct 2004 16:11:30 -0000 1.62 @@ -177,6 +177,10 @@ caps = GST_FF_VID_CAPS_NEW ("video/x-pn-realvideo", "systemstream", G_TYPE_BOOLEAN, FALSE, "rmversion", G_TYPE_INT, version, NULL); + if (context) { + gst_caps_set_simple (caps, + "rmsubid", GST_TYPE_FOURCC, context->sub_id, NULL); + } } while (0); break; @@ -1183,6 +1187,16 @@ + case CODEC_ID_RV10: + case CODEC_ID_RV20: + do { + guint32 fourcc; + if (gst_structure_get_fourcc (str, "rmsubid", &fourcc)) + context->sub_id = fourcc; + } while (0); + break; default: } |