Commit 4278662d authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

treat frame_size > 1 as compressed audio

Originally committed as revision 8461 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c72e05ba
......@@ -1479,19 +1479,13 @@ static int mov_write_header(AVFormatContext *s)
track->tag = mov_find_audio_codec_tag(s, track);
track->timescale = st->codec->sample_rate;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
switch(track->enc->codec_id){
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) {
if(!st->codec->frame_size){
av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
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;
}
}
}
......
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