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/mpegenc.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/mpegenc.c')
-rw-r--r-- | libavformat/mpegenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 3ef2b24692..9cee9674a0 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -43,7 +43,7 @@ typedef struct PacketDesc { struct PacketDesc *next; } PacketDesc; -typedef struct { +typedef struct StreamInfo { AVFifoBuffer *fifo; uint8_t id; int max_buffer_size; /* in bytes */ @@ -59,7 +59,7 @@ typedef struct { int64_t vobu_start_pts; } StreamInfo; -typedef struct { +typedef struct MpegMuxContext { const AVClass *class; int packet_size; /* required packet size */ int packet_number; |