mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-29 10:52:20 +00:00
Merge commit '8de77b665d2a2f1cd560d2183fd4664298b30715'
* commit '8de77b665d2a2f1cd560d2183fd4664298b30715':
fate: Add fic-in-avi test
Conflicts:
tests/ref/fate/fic-avi
See: d66de5006b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
817627d925