diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
commit | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (patch) | |
tree | f926b3af6429d0318cb785aacace2d1b967f0a35 /libavcodec/alsdec.c | |
parent | a0fe1a25fa76809005cb90beb09e66cb7493b353 (diff) | |
parent | 7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 (diff) | |
download | ffmpeg-a94eba6f0c0666de8ccbc56c62112d7e5f1132be.tar.gz |
Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
avcodec: Don't anonymously typedef structs
Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alsdec.c')
-rw-r--r-- | libavcodec/alsdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index b3d30861b3..bac434fa63 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -152,7 +152,7 @@ enum RA_Flag { }; -typedef struct { +typedef struct ALSSpecificConfig { uint32_t samples; ///< number of samples, 0xFFFFFFFF if unknown int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer @@ -178,7 +178,7 @@ typedef struct { } ALSSpecificConfig; -typedef struct { +typedef struct ALSChannelData { int stop_flag; int master_channel; int time_diff_flag; @@ -188,7 +188,7 @@ typedef struct { } ALSChannelData; -typedef struct { +typedef struct ALSDecContext { AVCodecContext *avctx; ALSSpecificConfig sconf; GetBitContext gb; @@ -228,7 +228,7 @@ typedef struct { } ALSDecContext; -typedef struct { +typedef struct ALSBlockData { unsigned int block_length; ///< number of samples within the block unsigned int ra_block; ///< if true, this is a random access block int *const_block; ///< if true, this is a constant value block |