Commit b7d1cd02 authored by Bartlomiej Wolowiec's avatar Bartlomiej Wolowiec
Browse files

Nellymoser handling in FLV

Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 17ac9f1c
......@@ -39,6 +39,7 @@ static const AVCodecTag flv_audio_codec_ids[] = {
{CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET},
{CODEC_ID_NONE, 0}
};
......@@ -95,6 +96,9 @@ static int get_audio_flags(AVCodecContext *enc){
case CODEC_ID_ADPCM_SWF:
flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT;
break;
case CODEC_ID_NELLYMOSER:
flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT;
break;
case 0:
flags |= enc->codec_tag<<4;
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment