diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-09-12 11:39:05 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-09-12 11:39:05 +0000 |
| commit | f663868fcdc7239a9761de87d986fbb4595aa7a0 (patch) | |
| tree | 241e00300b9cd0b338af739912c4ff46878ccada /gst | |
| parent | 07e5bc672f3c2147f98aca08f6f095dbb77d2c93 (diff) | |
Clarify DV type 1/2 difference
Original commit message from CVS:
Clarify DV type 1/2 difference
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/avi/gstavidemux.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index bb2abe5e..ed605935 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -693,7 +693,7 @@ gst_avi_demux_video_caps (guint32 codec_fcc, "video/x-dv", "systemstream", GST_PROPS_BOOLEAN (FALSE) ); - codecname = g_strdup_printf("Digital Video (" GST_FOURCC_FORMAT ")", + codecname = g_strdup_printf("Digital Video type 2 (" GST_FOURCC_FORMAT ")", GST_FOURCC_ARGS(codec_fcc)); break; @@ -726,7 +726,7 @@ gst_avi_demux_video_caps (guint32 codec_fcc, } /* set video codec info on streaminfo caps */ - if (strf != NULL && codecname != NULL) { + if (avi_demux != NULL && codecname != NULL) { GstPropsEntry *entry; entry = gst_props_entry_new("videocodec", GST_PROPS_STRING(codecname)); @@ -943,7 +943,7 @@ gst_avi_demux_audio_caps (guint16 codec_id, break; } - if (strf != NULL && codecname != NULL) { + if (avi_demux != NULL && codecname != NULL) { /* set audio codec in streaminfo */ GstPropsEntry *entry; entry = gst_props_entry_new("audiocodec", @@ -1028,6 +1028,7 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux) GstByteStream *bs = avi_demux->bs; guint32 got_bytes; gchar *padname; + GstPropsEntry *entry; got_bytes = gst_bytestream_peek_bytes (bs, &strfdata, sizeof (gst_riff_strf_iavs)); strf = (gst_riff_strf_iavs *) strfdata; @@ -1050,6 +1051,9 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux) g_free (padname); caps = gst_avi_demux_iavs_caps (); + entry = gst_props_entry_new("videocodec", + GST_PROPS_STRING("Digital Video type 1")); + gst_props_add_entry(avi_demux->streaminfo->properties, entry); if (caps != NULL) { gst_pad_try_set_caps(srcpad, caps); |