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/rmenc.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/rmenc.c')
-rw-r--r-- | libavformat/rmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 2e50ed338c..d019e1beab 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -23,7 +23,7 @@ #include "rm.h" #include "libavutil/dict.h" -typedef struct { +typedef struct StreamInfo { int nb_packets; int packet_total_size; int packet_max_size; @@ -36,7 +36,7 @@ typedef struct { AVCodecContext *enc; } StreamInfo; -typedef struct { +typedef struct RMMuxContext { StreamInfo streams[2]; StreamInfo *audio_stream, *video_stream; int data_pos; /* position of the data after the header */ |