mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-13 18:49:01 +02:00
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>
This commit is contained in:
commit
489d8a79a6