diff --git a/libavformat/img2.c b/libavformat/img2.c
index ec37a388456ba9bfa885f10fecafe26d1c37c603..4eef62371d41e159ad967e92a97fd96658bed0b2 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -82,6 +82,7 @@ static const IdStrMap img_tags[] = {
     { CODEC_ID_SUNRAST   , "im24"},
     { CODEC_ID_SUNRAST   , "sunras"},
     { CODEC_ID_JPEG2000  , "jp2"},
+    { CODEC_ID_JPEG2000  , "jpc"},
     { CODEC_ID_DPX       , "dpx"},
     { CODEC_ID_PICTOR    , "pic"},
     { CODEC_ID_NONE      , NULL}
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b2e8414b5d9b90ab8df24a98ef3f1dbb449866ce..817349cb82d19b48a5fca6395ae39a78993eeead 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -250,6 +250,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_ZMBV,         MKTAG('Z', 'M', 'B', 'V') },
     { CODEC_ID_KMVC,         MKTAG('K', 'M', 'V', 'C') },
     { CODEC_ID_CAVS,         MKTAG('C', 'A', 'V', 'S') },
+    { CODEC_ID_JPEG2000,     MKTAG('m', 'j', 'p', '2') },
     { CODEC_ID_JPEG2000,     MKTAG('M', 'J', '2', 'C') },
     { CODEC_ID_VMNC,         MKTAG('V', 'M', 'n', 'c') },
     { CODEC_ID_TARGA,        MKTAG('t', 'g', 'a', ' ') },