diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:18:17 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:18:17 +0300 |
commit | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (patch) | |
tree | f926b3af6429d0318cb785aacace2d1b967f0a35 /libavcodec/qcelpdec.c | |
parent | a0fe1a25fa76809005cb90beb09e66cb7493b353 (diff) | |
parent | 7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 (diff) |
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/qcelpdec.c')
-rw-r--r-- | libavcodec/qcelpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 03364f6013..22564edb7a 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -50,7 +50,7 @@ typedef enum { RATE_FULL } qcelp_packet_rate; -typedef struct { +typedef struct QCELPContext { GetBitContext gb; qcelp_packet_rate bitrate; QCELPFrame frame; /**< unpacked data frame */ |