diff options
author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-18 11:48:57 +0000 |
---|---|---|
committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-18 11:48:57 +0000 |
commit | c947dec982117ee0b96a39f4736f6817a7522ed6 (patch) | |
tree | 8a9d1a82481ed4442db3211e1673d8eb64118b29 /libavcodec/liba52/a52.h | |
parent | ca390e727d165bf80445035c4b67a7239fdc87c0 (diff) | |
download | ffmpeg-c947dec982117ee0b96a39f4736f6817a7522ed6.tar.gz |
* sync with main liba52 sources
Originally committed as revision 1590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/liba52/a52.h')
-rw-r--r-- | libavcodec/liba52/a52.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libavcodec/liba52/a52.h b/libavcodec/liba52/a52.h index b31a881efb..d3346ec929 100644 --- a/libavcodec/liba52/a52.h +++ b/libavcodec/liba52/a52.h @@ -1,6 +1,6 @@ /* * a52.h - * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org> + * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * This file is part of a52dec, a free ATSC A-52 stream decoder. @@ -30,10 +30,15 @@ #undef free #undef realloc -#ifndef LIBA52_DOUBLE -typedef float sample_t; -#else +#if defined(LIBA52_FIXED) +typedef int32_t sample_t; +typedef int32_t level_t; +#elif defined(LIBA52_DOUBLE) typedef double sample_t; +typedef double level_t; +#else +typedef float sample_t; +typedef float level_t; #endif typedef struct a52_state_s a52_state_t; @@ -59,9 +64,9 @@ sample_t * a52_samples (a52_state_t * state); int a52_syncinfo (uint8_t * buf, int * flags, int * sample_rate, int * bit_rate); int a52_frame (a52_state_t * state, uint8_t * buf, int * flags, - sample_t * level, sample_t bias); + level_t * level, sample_t bias); void a52_dynrng (a52_state_t * state, - sample_t (* call) (sample_t, void *), void * data); + level_t (* call) (level_t, void *), void * data); int a52_block (a52_state_t * state); void a52_free (a52_state_t * state); |