mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-11-11 12:02:22 +03:00
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b': fate: Move tdsc to the appropriate screen capture file Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>