Merge remote-tracking branch 'cehoyos/master'

[ffmpeg] / libavcodec / allcodecs.c

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 19a638ccbb3a2f09c5874e725050c730ee39e92b..d5b69164e630b93f72449c9addd9e3660a11aa73 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -171,7 +171,8 @@ void avcodec_register_all(void)
     REGISTER_DECODER(INDEO4,            indeo4);
     REGISTER_DECODER(INDEO5,            indeo5);
     REGISTER_DECODER(INTERPLAY_VIDEO,   interplay_video);
-    REGISTER_ENCDEC (JPEG2000,          jpeg2000);
+    REGISTER_ENCDEC (J2K,               j2k);
+    REGISTER_DECODER(JPEG2000,          jpeg2000);
     REGISTER_ENCDEC (JPEGLS,            jpegls);
     REGISTER_DECODER(JV,                jv);
     REGISTER_DECODER(KGV1,              kgv1);