mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
ae3d2afd46
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b': fate: Move tdsc to the appropriate screen capture file Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>