Mercurial > libavcodec.hg

changeset 8659:61ae841cd13e libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
define FLAC metadata types in flac.h
author jbr
date Sun, 25 Jan 2009 00:33:25 +0000
parents dc8fd7c55928
children 4f1525c698e9
files flac.h flacdec.c
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/flac.h	Sat Jan 24 19:05:52 2009 +0000
+++ b/flac.h	Sun Jan 25 00:33:25 2009 +0000
@@ -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.
--- a/flacdec.c	Sat Jan 24 19:05:52 2009 +0000
+++ b/flacdec.c	Sun Jan 25 00:33:25 2009 +0000
@@ -73,8 +73,6 @@
     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 @@
 
             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;