diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:07:40 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:07:40 +0300 |
| commit | a0fe1a25fa76809005cb90beb09e66cb7493b353 (patch) | |
| tree | bdbcbe4b6ae9cfc43f4a614c2d85cef715abd483 /libavformat/rtpdec_qcelp.c | |
| parent | 4ab7eb0da2326ccc424f8fdd69ca31c61edc2eb5 (diff) | |
| parent | daf8cf358a098a903d59adb6c0d0cc3262a8c93e (diff) | |
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_qcelp.c')
| -rw-r--r-- | libavformat/rtpdec_qcelp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c index eebcdd025b..f2893499d5 100644 --- a/libavformat/rtpdec_qcelp.c +++ b/libavformat/rtpdec_qcelp.c @@ -25,7 +25,7 @@ static const uint8_t frame_sizes[] = { 1, 4, 8, 17, 35 }; -typedef struct { +typedef struct InterleavePacket { int pos; int size; /* The largest frame is 35 bytes, only 10 frames are allowed per |