matroskadec: simplify, first_timecode is already in the index

[ffmpeg] / libavformat / flv.h

diff --git a/libavformat/flv.h b/libavformat/flv.h
index 3d05857afa63790ed85beb746cab681656348507..efa8cebe8ac1b58d8766be9e6052b6bcf015fe17 100644 (file)
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FLV_H
-#define FLV_H
+#ifndef AVFORMAT_FLV_H
+#define AVFORMAT_FLV_H
 
 /* offsets for packed values */
 #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
@@ -71,18 +71,23 @@ enum {
 };
 
 enum {
-    FLV_CODECID_PCM_BE              = 0,
+    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_AAC                 = 10<< FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_SPEEX               = 11<< FLV_AUDIO_CODECID_OFFSET,
 };
 
 enum {
-    FLV_CODECID_H263   = 2,
-    FLV_CODECID_SCREEN = 3,
-    FLV_CODECID_VP6    = 4,
+    FLV_CODECID_H263    = 2,
+    FLV_CODECID_SCREEN  = 3,
+    FLV_CODECID_VP6     = 4,
+    FLV_CODECID_VP6A    = 5,
+    FLV_CODECID_SCREEN2 = 6,
+    FLV_CODECID_H264    = 7,
 };
 
 enum {
@@ -105,4 +110,4 @@ typedef enum {
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FLV_H */
+#endif /* AVFORMAT_FLV_H */