prores: change license to LGPL, merge some parts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Elvis Presley 2011-10-12 19:10:22 +02:00 committed by Michael Niedermayer
parent b87d882578
commit bebaf4ea1f
5 changed files with 94 additions and 87 deletions

View file

@ -172,7 +172,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (PICTOR, pictor);
REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm);
REGISTER_DECODER (PRORES_GPL, prores_gpl);
REGISTER_DECODER (PRORES, prores);
REGISTER_DECODER (PRORES_LGPL, prores_lgpl);
REGISTER_DECODER (PTX, ptx);
REGISTER_DECODER (QDRAW, qdraw);