virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

do not fail if audio is uncompressed and frame size is not set, just set it

Browse Source 
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-09-05 02:30:27 +00:00
parent 235a51ad31
commit cf74dd4a5c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/movenc.c
View File

@ -1604,12 +1604,13 @@ static int mov_write_header(AVFormatContext *s)
}else if(st->codec->codec_type == CODEC_TYPE_AUDIO){ }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){
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);
if(!st->codec->frame_size){ if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) {
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 */ }else if(st->codec->frame_size > 1){ /* assume compressed audio */
track->audio_vbr = 1; track->audio_vbr = 1;
}else{ }else{
st->codec->frame_size = 1;
track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
} }
if(track->mode != MODE_MOV && if(track->mode != MODE_MOV &&