Revision f31065f6

View differences:

libavcodec/avcodec.h
119 119
    CODEC_ID_KMVC,
120 120
    CODEC_ID_FLASHSV,
121 121
    CODEC_ID_CAVS,
122
    CODEC_ID_JPEG2000,
122 123

  
123 124
    /* various pcm "codecs" */
124 125
    CODEC_ID_PCM_S16LE= 0x10000,
libavformat/riff.c
153 153
    { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
154 154
    { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
155 155
    { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
156
    { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
156 157
    { CODEC_ID_RAWVIDEO, 0 },
157 158
    { CODEC_ID_NONE, 0 },
158 159
};

Also available in: Unified diff