Removes trailing spaces. Removes tabs.

[vlc] / include / vlc_codecs.h

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 1e4117ce738cc65abad908db2062cc48db920654..1f8c7015ead712589405eb42abee727a88bd3e36 100644 (file)
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_CODECS_H
 #define _VLC_CODECS_H 1
 
@@ -232,6 +236,7 @@ typedef struct
 #define WAVE_FORMAT_WMAL                0x0163 /* WMA 9 Lossless */
 #define WAVE_FORMAT_DIVIO_AAC           0x4143
 #define WAVE_FORMAT_AAC                 0x00FF
+#define WAVE_FORMAT_FFMPEG_AAC          0x706D
 
 /* Need to check these */
 #define WAVE_FORMAT_DK3                 0x0061
@@ -260,7 +265,7 @@ static const GUID VLC_KSDATAFORMAT_SUBTYPE_PCM = {0xE923AABF, 0xCB58, 0x4471, {0
 #define KSDATAFORMAT_SUBTYPE_PCM VLC_KSDATAFORMAT_SUBTYPE_PCM
 #endif
 
-#ifndef _KSDATAFORMAT_SUBTYPE_UNKNOWN_ 
+#ifndef _KSDATAFORMAT_SUBTYPE_UNKNOWN_
 #define _KSDATAFORMAT_SUBTYPE_UNKNOWN_ {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
 static const GUID VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
 #define KSDATAFORMAT_SUBTYPE_UNKNOWN VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN
@@ -317,6 +322,7 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_DTS_MS,     VLC_FOURCC( 'd', 't', 's', ' ' ), "DTS Coherent Acoustics" },
     { WAVE_FORMAT_DIVIO_AAC,  VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio (Divio)" },
     { WAVE_FORMAT_AAC,        VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" },
+    { WAVE_FORMAT_FFMPEG_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" },
     { WAVE_FORMAT_VORB_1,     VLC_FOURCC( 'v', 'o', 'r', '1' ), "Vorbis 1 Audio" },
     { WAVE_FORMAT_VORB_1PLUS, VLC_FOURCC( 'v', 'o', '1', '+' ), "Vorbis 1+ Audio" },
     { WAVE_FORMAT_VORB_2,     VLC_FOURCC( 'v', 'o', 'r', '2' ), "Vorbis 2 Audio" },
@@ -377,7 +383,7 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag,
 {
     int i;
 
-    for( i = 0; !guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, 
+    for( i = 0; !guidcmp( &sub_format_tag_to_fourcc[i].guid_tag,
                           &KSDATAFORMAT_SUBTYPE_UNKNOWN ); i++ )
     {
         if( guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, guid_tag ) ) break;