Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_overlay: properly sync inputs.
Conflicts:
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* qatar/master:
vf_overlay: properly sync inputs.
Conflicts:
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>