define FLAC metadata types in flac.h

Originally committed as revision 16765 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index e110f48cec05c02086377534daa19f569ee2dd19..bab6b1d16d28aad44ee2f393a0a56c2817b67f3d 100644 (file)
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -29,6 +29,17 @@
 
 #include "avcodec.h"
 
 
 #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.
 /**
  * Data needed from the Streaminfo header for use by the raw FLAC demuxer
  * and/or the FLAC decoder.

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index a1faa13e473d7584b49b7ca88124d86ca82973a9..16aa4763768082b81a1e44f9ee27771181773464 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -73,8 +73,6 @@ typedef struct FLACContext {
     unsigned int allocated_bitstream_size;
 } FLACContext;
 
     unsigned int allocated_bitstream_size;
 } FLACContext;
 

-#define METADATA_TYPE_STREAMINFO 0
-

 static const int sample_rate_table[] =
 { 0,
   88200, 176400, 192000,
 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) {
 
             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;
                     ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s,
                                              s->gb.buffer+get_bits_count(&s->gb)/8);
                     streaminfo_updated = 1;