diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
commit | a0fe1a25fa76809005cb90beb09e66cb7493b353 (patch) | |
tree | bdbcbe4b6ae9cfc43f4a614c2d85cef715abd483 /libavformat/bink.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/bink.c')
-rw-r--r-- | libavformat/bink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/bink.c b/libavformat/bink.c index 395c8d9aa8..92ce26198d 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -46,7 +46,7 @@ enum BinkAudFlags { #define BINK_MAX_WIDTH 7680 #define BINK_MAX_HEIGHT 4800 -typedef struct { +typedef struct BinkDemuxContext { uint32_t file_size; uint32_t num_audio_tracks; |