diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-04-11 19:33:55 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-04-11 19:33:55 +0000 |
| commit | b1bd867b5e4a22501fb2c6fdff6e157c58da95a1 (patch) | |
| tree | 96a2b3cdb765481eb1d858cc86729f0069e35a8a | |
| parent | 40203b6472b1a3e5d1bfd348f1824429ed6132a9 (diff) | |
| download | gst-plugins-bad-b1bd867b5e4a22501fb2c6fdff6e157c58da95a1.tar.gz gst-plugins-bad-b1bd867b5e4a22501fb2c6fdff6e157c58da95a1.tar.bz2 gst-plugins-bad-b1bd867b5e4a22501fb2c6fdff6e157c58da95a1.zip | |
gst-libs/gst/riff/riff-media.c: Fix another codecname mismatch.
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
Fix another codecname mismatch.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2004-04-11 Ronald Bultje <rbultje@ronald.bitfreak.net> + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): + Fix another codecname mismatch. + +2004-04-11 Ronald Bultje <rbultje@ronald.bitfreak.net> + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): Fix divx caps mismatch and move from video/x-jpeg to image/jpeg so that MJPEG plays back. diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index cbefac2d..683ec624 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -257,7 +257,7 @@ gst_riff_create_audio_caps (guint16 codec_id, *codec_name = g_strdup ("MPEG 1 layer 2"); break; - case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */ + case GST_RIFF_WAVE_FORMAT_PCM: /* PCM */ if (strf != NULL) { gint ba = GUINT16_FROM_LE (strf->blockalign); gint ch = GUINT16_FROM_LE (strf->channels); @@ -274,7 +274,7 @@ gst_riff_create_audio_caps (guint16 codec_id, "width = (int) { 8, 16 }, " "height = (int) { 8, 16 }"); } if (codec_name) - *codec_name = g_strdup ("PCM WAV"); + *codec_name = g_strdup ("Uncompressed PCM audio"); break; case GST_RIFF_WAVE_FORMAT_MULAW: |