diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-01-25 00:33:25 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-01-25 00:33:25 +0000 |
| commit | d38b88213ed25ed4c552a00b2b6ed07e93b4590b (patch) | |
| tree | 388f21ea4ec9e1d198eeac14b1cb4b9e0d488097 | |
| parent | 6cde949a2084293c7f3661460b5758f11908cac9 (diff) | |
| download | ffmpeg-d38b88213ed25ed4c552a00b2b6ed07e93b4590b.tar.gz | |
define FLAC metadata types in flac.h
Originally committed as revision 16765 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/flac.h | 11 | ||||
| -rw-r--r-- | libavcodec/flacdec.c | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libavcodec/flac.h b/libavcodec/flac.h index e110f48cec..bab6b1d16d 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -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. diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index a1faa13e47..16aa476376 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -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; |