diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:20:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:20:17 +0200 |
commit | 74a8dbe1c405e041a16c44050d9dfc92aca90d33 (patch) | |
tree | 49fa40ab5ebb4dc10ac88c1f11bc84337aaa2c11 /libavfilter/src_movie.c | |
parent | 010732b73a0869d222cb281431a9a4aae89355e6 (diff) | |
parent | 58400ac133bcfb6bf8196b4e5208bc178307739b (diff) |
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/src_movie.c')
-rw-r--r-- | libavfilter/src_movie.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 82bcc56f3d..bcc8e05495 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -44,12 +44,12 @@ #include "internal.h" #include "video.h" -typedef struct { +typedef struct MovieStream { AVStream *st; int done; } MovieStream; -typedef struct { +typedef struct MovieContext { /* common A/V fields */ const AVClass *class; int64_t seek_point; ///< seekpoint in microseconds |