diff options
| author | Elvis Presley <elvis@e.p> | 2011-10-12 19:10:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-12 19:55:25 +0200 |
| commit | bebaf4ea1f72b5de523e8548b12d7ad79bdcaf01 (patch) | |
| tree | 3a206fc8d32f95ebbeea95341a96e775bff29a8b /libavcodec/allcodecs.c | |
| parent | b87d882578807e9a45848a528891bd82a5165712 (diff) | |
prores: change license to LGPL, merge some parts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 6226cac3ce..bc10f46702 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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); |