mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-19 07:05:53 +08:00
Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
* 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 <michaelni@gmx.at>
This commit is contained in:
@@ -140,6 +140,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_DECODER(CPIA, cpia);
|
||||
REGISTER_DECODER(CSCD, cscd);
|
||||
REGISTER_DECODER(CYUV, cyuv);
|
||||
REGISTER_DECODER(DDS, dds);
|
||||
REGISTER_DECODER(DFA, dfa);
|
||||
REGISTER_DECODER(DIRAC, dirac);
|
||||
REGISTER_ENCDEC (DNXHD, dnxhd);
|
||||
|
Reference in New Issue
Block a user