summaryrefslogtreecommitdiff
path: root/libavformat/nuv.c
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/nuv.c
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/nuv.c')
-rw-r--r--libavformat/nuv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 65d2e56f19..001d9c8860 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -33,7 +33,7 @@ static const AVCodecTag nuv_audio_tags[] = {
{ AV_CODEC_ID_NONE, 0 },
};
-typedef struct {
+typedef struct NUVContext {
int v_id;
int a_id;
int rtjpg_video;