X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflv.h;h=c2a037b026b57925edcedbc80b5a7848bd9aab16;hb=bf23f6dc334392e747021c15383d2db081b6f594;hp=4501527aa65a2cdf456429cbbbaf21485bca739e;hpb=44de39f93c57f3761a00a85dc459decc3fdc1839;p=ffmpeg

diff --git a/libavformat/flv.h b/libavformat/flv.h
index 4501527aa65..c2a037b026b 100644
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -2,7 +2,7 @@
  * @file flv.h
  * FLV common header
  *
- * Copyright (c) 2006 The FFmpeg Project.
+ * Copyright (c) 2006 The FFmpeg Project
  *
  * This file is part of FFmpeg.
  *
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FLV_H
-#define FFMPEG_FLV_H
+#ifndef AVFORMAT_FLV_H
+#define AVFORMAT_FLV_H
 
 /* offsets for packed values */
 #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
@@ -71,12 +71,14 @@ enum {
 };
 
 enum {
-    FLV_CODECID_PCM                 = 0,
-    FLV_CODECID_ADPCM               = 1 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_MP3                 = 2 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_PCM_LE              = 3 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
-    FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_PCM                  = 0,
+    FLV_CODECID_ADPCM                = 1 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_MP3                  = 2 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_PCM_LE               = 3 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_NELLYMOSER_8KHZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_NELLYMOSER           = 6 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_AAC                  = 10<< FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_SPEEX                = 11<< FLV_AUDIO_CODECID_OFFSET,
 };
 
 enum {
@@ -85,6 +87,7 @@ enum {
     FLV_CODECID_VP6     = 4,
     FLV_CODECID_VP6A    = 5,
     FLV_CODECID_SCREEN2 = 6,
+    FLV_CODECID_H264    = 7,
 };
 
 enum {
@@ -107,4 +110,4 @@ typedef enum {
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FFMPEG_FLV_H */
+#endif /* AVFORMAT_FLV_H */