[FFmpeg-cvslog] r16765 - in trunk/libavcodec: flac.h flacdec.c

[jbr]

Author: jbr
Date: Sun Jan 25 01:33:25 2009
New Revision: 16765

Log:
define FLAC metadata types in flac.h

Modified:
   trunk/libavcodec/flac.h
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flac.h
==============================================================================
--- trunk/libavcodec/flac.h	Sun Jan 25 01:16:27 2009	(r16764)
+++ trunk/libavcodec/flac.h	Sun Jan 25 01:33:25 2009	(r16765)
@@ -29,6 +29,17 @@
 
 #include "avcodec.h"
 
+enum {
+    FLAC_METADATA_TYPE_STREAMINFO = 0,
+    FLAC_METADATA_TYPE_PADDING,
+    FLAC_METADATA_TYPE_APPLICATION,
+    FLAC_METADATA_TYPE_SEEKTABLE,
+    FLAC_METADATA_TYPE_VORBIS_COMMENT,
+    FLAC_METADATA_TYPE_CUESHEET,
+    FLAC_METADATA_TYPE_PICTURE,
+    FLAC_METADATA_TYPE_INVALID = 127
+};
+
 /**
  * Data needed from the Streaminfo header for use by the raw FLAC demuxer
  * and/or the FLAC decoder.

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Sun Jan 25 01:16:27 2009	(r16764)
+++ trunk/libavcodec/flacdec.c	Sun Jan 25 01:33:25 2009	(r16765)
@@ -73,8 +73,6 @@ typedef struct FLACContext {
     unsigned int allocated_bitstream_size;
 } FLACContext;
 
-#define METADATA_TYPE_STREAMINFO 0
-
 static const int sample_rate_table[] =
 { 0,
   88200, 176400, 192000,
@@ -207,7 +205,7 @@ static int metadata_parse(FLACContext *s
 
             if (metadata_size) {
                 switch (metadata_type) {
-                case METADATA_TYPE_STREAMINFO:
+                case FLAC_METADATA_TYPE_STREAMINFO:
                     ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s,
                                              s->gb.buffer+get_bits_count(&s->gb)/8);
                     streaminfo_updated = 1;