diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-05-17 16:29:16 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-05-17 16:29:16 +0000 |
| commit | 6e1e401f433c30417e38f39c0e2dce6ba81aaaae (patch) | |
| tree | 5a8db62c6721101bf9aa524e1a6cc519f7d70903 | |
| parent | b8ba89625b5adbd29add6d112b13d5fed02e3579 (diff) | |
| download | gst-plugins-bad-6e1e401f433c30417e38f39c0e2dce6ba81aaaae.tar.gz gst-plugins-bad-6e1e401f433c30417e38f39c0e2dce6ba81aaaae.tar.bz2 gst-plugins-bad-6e1e401f433c30417e38f39c0e2dce6ba81aaaae.zip | |
rename WMAx codec defines to be consistent
Original commit message from CVS:
rename WMAx codec defines to be consistent
| -rw-r--r-- | gst-libs/gst/riff/riff-ids.h | 6 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h index 9a1f5669..3c4fc78f 100644 --- a/gst-libs/gst/riff/riff-ids.h +++ b/gst-libs/gst/riff/riff-ids.h @@ -276,9 +276,9 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */ #define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_ALAW (0x0102) #define GST_RIFF_IBM_FORMAT_ADPCM (0x0103) -#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV1 (0x0160) -#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2 (0x0161) -#define GST_RIFF_WAVE_FORMAT_WMAV9 (0x0162) +#define GST_RIFF_WAVE_FORMAT_WMAV1 (0x0160) +#define GST_RIFF_WAVE_FORMAT_WMAV2 (0x0161) +#define GST_RIFF_WAVE_FORMAT_WMAV3 (0x0162) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 49a0b9cd..1211a0a7 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -214,21 +214,21 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, caps = gst_caps_new_simple ("video/x-wmv", "wmvversion", G_TYPE_INT, 1, NULL); if (codec_name) - *codec_name = g_strdup ("Windows Media Video 7"); + *codec_name = g_strdup ("Microsoft Windows Media 7 (WMV1)"); break; case GST_MAKE_FOURCC ('W', 'M', 'V', '2'): caps = gst_caps_new_simple ("video/x-wmv", "wmvversion", G_TYPE_INT, 2, NULL); if (codec_name) - *codec_name = g_strdup ("Windows Media Video 8"); + *codec_name = g_strdup ("Microsoft Windows Media 8 (WMV2)"); break; case GST_MAKE_FOURCC ('W', 'M', 'V', '3'): caps = gst_caps_new_simple ("video/x-wmv", "wmvversion", G_TYPE_INT, 3, NULL); if (codec_name) - *codec_name = g_strdup ("Windows Media Video 9"); + *codec_name = g_strdup ("Microsoft Windows Media 9 (WMV3)"); break; case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): |