From: Ronald S. Bultje Date: Sun, 11 Apr 2004 19:33:55 +0000 (+0000) Subject: gst-libs/gst/riff/riff-media.c: Fix another codecname mismatch. X-Git-Tag: 1.19.3~505^2~3640 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b72d42dc44421035a40e3d38fcc292c2df43ec2;p=platform%2Fupstream%2Fgstreamer.git 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. --- diff --git a/ChangeLog b/ChangeLog index 5374e04..a841e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-04-11 Ronald Bultje + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): + Fix another codecname mismatch. + +2004-04-11 Ronald Bultje + * 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 cbefac2..683ec62 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: