aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-14 21:07:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-14 21:07:40 +0100
commita0fe1a25fa76809005cb90beb09e66cb7493b353 (patch)
treebdbcbe4b6ae9cfc43f4a614c2d85cef715abd483 /libavformat/img2.h
parent4ab7eb0da2326ccc424f8fdd69ca31c61edc2eb5 (diff)
parentdaf8cf358a098a903d59adb6c0d0cc3262a8c93e (diff)
downloadffmpeg-a0fe1a25fa76809005cb90beb09e66cb7493b353.tar.gz
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/img2.h')
-rw-r--r--libavformat/img2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2.h b/libavformat/img2.h
index 58a6833835..67bd7a325f 100644
--- a/libavformat/img2.h
+++ b/libavformat/img2.h
@@ -30,7 +30,7 @@
#include <glob.h>
#endif
-typedef struct {
+typedef struct VideoDemuxData {
const AVClass *class; /**< Class for private options. */
int img_first;
int img_last;