generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

treat frame_size > 1 as compressed audio

Browse Source 
Originally committed as revision 8461 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-03-21 10:03:27 +00:00
parent c72e05ba0f
commit 4278662d45
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/movenc.c
View File

@ -1479,19 +1479,13 @@ static int mov_write_header(AVFormatContext *s)
track->tag = mov_find_audio_codec_tag(s, track); track->tag = mov_find_audio_codec_tag(s, track);
track->timescale = st->codec->sample_rate; track->timescale = st->codec->sample_rate;
av_set_pts_info(st, 64, 1, st->codec->sample_rate); av_set_pts_info(st, 64, 1, st->codec->sample_rate);
switch(track->enc->codec_id){ if(!st->codec->frame_size){
case CODEC_ID_MP3:
case CODEC_ID_AAC:
case CODEC_ID_AMR_NB:
case CODEC_ID_AMR_WB:
track->audio_vbr = 1;
break;
default:
track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
}
if (!st->codec->frame_size) {
av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i); av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
return -1; return -1;
}else if(st->codec->frame_size > 1){ /* assume compressed audio */
track->audio_vbr = 1;
}else{
track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
} }
} }
} }