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/smoothstreamingenc.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/smoothstreamingenc.c')
-rw-r--r-- | libavformat/smoothstreamingenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 075b303aa9..07173a96f9 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -38,7 +38,7 @@ #include "libavutil/mathematics.h" #include "libavutil/intreadwrite.h" -typedef struct { +typedef struct Fragment { char file[1024]; char infofile[1024]; int64_t start_time, duration; @@ -46,7 +46,7 @@ typedef struct { int64_t start_pos, size; } Fragment; -typedef struct { +typedef struct OutputStream { AVFormatContext *ctx; int ctx_inited; char dirname[1024]; @@ -66,7 +66,7 @@ typedef struct { int audio_tag; } OutputStream; -typedef struct { +typedef struct SmoothStreamingContext { const AVClass *class; /* Class for private options. */ int window_size; int extra_window_size; |