* add qdm2 support. Thanks to the ffmpeg people for this new feature.

diff --git a/NEWS b/NEWS
index a612304f9d4f7d7b8dad08ce0c53295e116d8576..0094aad52644b5ea4b0f4c2219c0fb94c6b449f8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Input:
 Decoders:
  * Support for libSDL_image to import different image types
  * Musepack decoder using libmpdec
+ * QDM2 audio support (needs ffmpeg from 19th oct 2005 or later)
 
 Services discovery:
  * UPnP service discovery

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index a978a27d5ce594f9e01e62845cc06f6a043e6647..1d56b000dfe136afd9568b38406e700f415d3352 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -992,6 +992,10 @@ static struct
       AUDIO_ES, "Apple Lossless Audio Codec" },
 #endif
 
+    /* QDM2 */
+    { VLC_FOURCC('Q','D','M','2'), CODEC_ID_QDM2,
+      AUDIO_ES, "QDM2" },
+
     /* PCM */
     { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
       AUDIO_ES, "PCM S8" },