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>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavformat/c93.c b/libavformat/c93.c
index 93a61be838..d67afcfb4b 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -24,13 +24,13 @@
 #include "voc.h"
 #include "libavutil/intreadwrite.h"
 
-typedef struct {
+typedef struct C93BlockRecord {
     uint16_t index;
     uint8_t length;
     uint8_t frames;
 } C93BlockRecord;
 
-typedef struct {
+typedef struct C93DemuxContext {
     VocDecContext voc;
 
     C93BlockRecord block_records[512];