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 /libavcodec/mss1.c | |
| parent | 010732b73a0869d222cb281431a9a4aae89355e6 (diff) | |
| parent | 58400ac133bcfb6bf8196b4e5208bc178307739b (diff) | |
| download | ffmpeg-streaming-74a8dbe1c405e041a16c44050d9dfc92aca90d33.zip ffmpeg-streaming-74a8dbe1c405e041a16c44050d9dfc92aca90d33.tar.gz | |
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 'libavcodec/mss1.c')
0 files changed, 0 insertions, 0 deletions
