comparison nsvdec.c @ 5290:0d5653941bf9 libavformat

Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.

5289:269fd2e634ba

    { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') },
    { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') },
*/
    { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') },
    { 0, 0 },
};

static const AVCodecTag nsv_codec_audio_tags[] = {
    { CODEC_ID_MP3,       MKTAG('M', 'P', '3', ' ') },
    { CODEC_ID_AAC,       MKTAG('A', 'A', 'C', ' ') },
    { CODEC_ID_AAC,       MKTAG('A', 'A', 'C', 'P') },
    { CODEC_ID_SPEEX,     MKTAG('S', 'P', 'X', ' ') },
    { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') },
    { 0, 0 },
};

//static int nsv_load_index(AVFormatContext *s);
static int nsv_read_chunk(AVFormatContext *s, int fill_header);

5290:0d5653941bf9

    { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') },
    { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') },
*/
    { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') },
    { CODEC_ID_NONE, 0 },
};

static const AVCodecTag nsv_codec_audio_tags[] = {
    { CODEC_ID_MP3,       MKTAG('M', 'P', '3', ' ') },
    { CODEC_ID_AAC,       MKTAG('A', 'A', 'C', ' ') },
    { CODEC_ID_AAC,       MKTAG('A', 'A', 'C', 'P') },
    { CODEC_ID_SPEEX,     MKTAG('S', 'P', 'X', ' ') },
    { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') },
    { CODEC_ID_NONE,      0 },
};

//static int nsv_load_index(AVFormatContext *s);
static int nsv_read_chunk(AVFormatContext *s, int fill_header);