diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 02:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:08 +0200 |
| commit | 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba (patch) | |
| tree | 90555a38c78062885be162271998559c64fe80ff /libavcodec/allcodecs.c | |
| parent | fd7e1190379db1b2b3eaa31c00dc9c92803faef3 (diff) | |
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index a6b3e720fb..55819fe262 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -172,8 +172,7 @@ void avcodec_register_all(void) REGISTER_DECODER(INDEO4, indeo4); REGISTER_DECODER(INDEO5, indeo5); REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video); - REGISTER_ENCDEC (J2K, j2k); - REGISTER_DECODER(JPEG2000, jpeg2000); + REGISTER_ENCDEC (JPEG2000, jpeg2000); REGISTER_ENCDEC (JPEGLS, jpegls); REGISTER_DECODER(JV, jv); REGISTER_DECODER(KGV1, kgv1); |