|
|
|
@ -83,8 +83,8 @@ static int nut_write_header(AVFormatContext * avf) { |
|
|
|
|
else fourcc = codec_get_tag(nut_tags, codec->codec_id); |
|
|
|
|
|
|
|
|
|
if (!fourcc) { |
|
|
|
|
if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = codec_get_bmp_tag(codec->codec_id); |
|
|
|
|
if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_wav_tag(codec->codec_id); |
|
|
|
|
if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = codec_get_tag(codec_bmp_tags, codec->codec_id); |
|
|
|
|
if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_tag(codec_wav_tags, codec->codec_id); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
s[i].fourcc_len = 4; |
|
|
|
@ -235,14 +235,14 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { |
|
|
|
|
switch(s[i].type) { |
|
|
|
|
case NUT_AUDIO_CLASS: |
|
|
|
|
st->codec->codec_type = CODEC_TYPE_AUDIO; |
|
|
|
|
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_wav_id(st->codec->codec_tag); |
|
|
|
|
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_id(codec_wav_tags, st->codec->codec_tag); |
|
|
|
|
|
|
|
|
|
st->codec->channels = s[i].channel_count; |
|
|
|
|
st->codec->sample_rate = s[i].samplerate_num / s[i].samplerate_denom; |
|
|
|
|
break; |
|
|
|
|
case NUT_VIDEO_CLASS: |
|
|
|
|
st->codec->codec_type = CODEC_TYPE_VIDEO; |
|
|
|
|
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_bmp_id(st->codec->codec_tag); |
|
|
|
|
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_id(codec_bmp_tags, st->codec->codec_tag); |
|
|
|
|
|
|
|
|
|
st->codec->width = s[i].width; |
|
|
|
|
st->codec->height = s[i].height; |
|
|
|
|