aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/flvenc.c
diff options
context:
space:
mode:
authorBartlomiej Wolowiec <bartek.wolowiec@gmail.com>2008-05-02 19:35:31 +0000
committerBartlomiej Wolowiec <bartek.wolowiec@gmail.com>2008-05-02 19:35:31 +0000
commitb7d1cd02e315999a616048b5cf9ea755cbd3b7e3 (patch)
tree7e17def3df7dd87e10045168ffaa48c83395c19c /libavformat/flvenc.c
parent17ac9f1c38cb831ffc9938d92afe63e5f687bfc3 (diff)
downloadffmpeg-b7d1cd02e315999a616048b5cf9ea755cbd3b7e3.tar.gz
Nellymoser handling in FLV
Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flvenc.c')
-rw-r--r--libavformat/flvenc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 0a45071a15..718e784098 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -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;