[0.11] gst-ffmpeg: ffmpeg: fix for audio caps change

[Wim Taymans]

Module: gst-ffmpeg
Branch: 0.11
Commit: 09a66b0923817fb3d8ea40a2012598313d9d1ab0
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=09a66b0923817fb3d8ea40a2012598313d9d1ab0

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Tue Sep  6 15:29:26 2011 +0200

ffmpeg: fix for audio caps change

---

 ext/ffmpeg/gstffmpegcodecmap.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 15274a1..e5bc881 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1288,16 +1288,16 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
 
       switch (codec_id) {
         case CODEC_ID_PCM_S16LE:
-          format = GST_AUDIO_FORMAT_S16_LE;
+          format = GST_AUDIO_FORMAT_S16LE;
           break;
         case CODEC_ID_PCM_S16BE:
-          format = GST_AUDIO_FORMAT_S16_BE;
+          format = GST_AUDIO_FORMAT_S16BE;
           break;
         case CODEC_ID_PCM_U16LE:
-          format = GST_AUDIO_FORMAT_U16_LE;
+          format = GST_AUDIO_FORMAT_U16LE;
           break;
         case CODEC_ID_PCM_U16BE:
-          format = GST_AUDIO_FORMAT_U16_BE;
+          format = GST_AUDIO_FORMAT_U16BE;
           break;
         case CODEC_ID_PCM_S8:
           format = GST_AUDIO_FORMAT_S8;
@@ -2764,16 +2764,16 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
         case GST_AUDIO_FORMAT_U8:
           id = CODEC_ID_PCM_U8;
           break;
-        case GST_AUDIO_FORMAT_S16_LE:
+        case GST_AUDIO_FORMAT_S16LE:
           id = CODEC_ID_PCM_S16LE;
           break;
-        case GST_AUDIO_FORMAT_S16_BE:
+        case GST_AUDIO_FORMAT_S16BE:
           id = CODEC_ID_PCM_S16BE;
           break;
-        case GST_AUDIO_FORMAT_U16_LE:
+        case GST_AUDIO_FORMAT_U16LE:
           id = CODEC_ID_PCM_U16LE;
           break;
-        case GST_AUDIO_FORMAT_U16_BE:
+        case GST_AUDIO_FORMAT_U16BE:
           id = CODEC_ID_PCM_U16BE;
           break;
         default: