Michael Niedermayer
|
74a8dbe1c4
|
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>
|
2014-04-19 18:20:17 +02:00 |
|
Vittorio Giovara
|
58400ac133
|
lavfi: name anonymous structs
|
2014-04-19 16:20:57 +02:00 |
|
Michael Niedermayer
|
f780a90355
|
Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'
* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a':
vf_hqdn3d: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-04-10 21:14:30 +02:00 |
|
Anton Khirnov
|
8c747d46f7
|
vf_hqdn3d: switch to an AVOptions-based system.
|
2013-04-09 19:05:12 +02:00 |
|
Michael Niedermayer
|
6726fb6533
|
avfilter/vf_hqdn3d.h: restore author attribution, history and project name
See git blame of pre split avfilter/vf_hqdn3d.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-02-02 13:18:10 +01:00 |
|
Diego Biurrun
|
76d90125cd
|
vf_hqdn3d: x86: Add proper arch optimization initialization
|
2013-02-01 13:11:45 +01:00 |
|