mirror of
https://github.com/libretro/FFmpeg.git
synced 2026-11-13 04:34:56 -10:00
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2': DirectDraw Surface image decoder Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/version.h tests/fate/image.mak Merged-by: Michael Niedermayer <[email protected]>