rename WMAx codec defines to be consistent

Original commit message from CVS:
rename WMAx codec defines to be consistent
This commit is contained in:
Stéphane Loeuillet 2004-05-17 16:29:16 +00:00
parent 064f3dbadc
commit c31c96a7ea
2 changed files with 6 additions and 6 deletions

View file

@ -276,9 +276,9 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_MULAW (0x0101)
#define GST_RIFF_IBM_FORMAT_ALAW (0x0102) #define GST_RIFF_IBM_FORMAT_ALAW (0x0102)
#define GST_RIFF_IBM_FORMAT_ADPCM (0x0103) #define GST_RIFF_IBM_FORMAT_ADPCM (0x0103)
#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV1 (0x0160) #define GST_RIFF_WAVE_FORMAT_WMAV1 (0x0160)
#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2 (0x0161) #define GST_RIFF_WAVE_FORMAT_WMAV2 (0x0161)
#define GST_RIFF_WAVE_FORMAT_WMAV9 (0x0162) #define GST_RIFF_WAVE_FORMAT_WMAV3 (0x0162)
#define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000)
#define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f)
#define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750)

View file

@ -214,21 +214,21 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 1, NULL); "wmvversion", G_TYPE_INT, 1, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 7"); *codec_name = g_strdup ("Microsoft Windows Media 7 (WMV1)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '2'): case GST_MAKE_FOURCC ('W', 'M', 'V', '2'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 2, NULL); "wmvversion", G_TYPE_INT, 2, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 8"); *codec_name = g_strdup ("Microsoft Windows Media 8 (WMV2)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '3'): case GST_MAKE_FOURCC ('W', 'M', 'V', '3'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 3, NULL); "wmvversion", G_TYPE_INT, 3, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 9"); *codec_name = g_strdup ("Microsoft Windows Media 9 (WMV3)");
break; break;
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):