Commit 78e03516 authored by Michael Niedermayer's avatar Michael Niedermayer

the user sets codec->time_base for video encding so she should also set it for audio encoding

Originally committed as revision 4555 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b983a5c6
...@@ -1683,6 +1683,7 @@ static int av_encode(AVFormatContext **output_files, ...@@ -1683,6 +1683,7 @@ static int av_encode(AVFormatContext **output_files,
codec->bit_rate = icodec->bit_rate; codec->bit_rate = icodec->bit_rate;
codec->extradata= icodec->extradata; codec->extradata= icodec->extradata;
codec->extradata_size= icodec->extradata_size; codec->extradata_size= icodec->extradata_size;
codec->time_base = icodec->time_base;
switch(codec->codec_type) { switch(codec->codec_type) {
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
codec->sample_rate = icodec->sample_rate; codec->sample_rate = icodec->sample_rate;
...@@ -1691,7 +1692,6 @@ static int av_encode(AVFormatContext **output_files, ...@@ -1691,7 +1692,6 @@ static int av_encode(AVFormatContext **output_files,
codec->block_align= icodec->block_align; codec->block_align= icodec->block_align;
break; break;
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
codec->time_base = icodec->time_base;
codec->width = icodec->width; codec->width = icodec->width;
codec->height = icodec->height; codec->height = icodec->height;
codec->has_b_frames = icodec->has_b_frames; codec->has_b_frames = icodec->has_b_frames;
...@@ -3531,6 +3531,7 @@ static void new_audio_stream(AVFormatContext *oc) ...@@ -3531,6 +3531,7 @@ static void new_audio_stream(AVFormatContext *oc)
audio_enc->channels = audio_channels; audio_enc->channels = audio_channels;
} }
audio_enc->sample_rate = audio_sample_rate; audio_enc->sample_rate = audio_sample_rate;
audio_enc->time_base= (AVRational){1, audio_sample_rate};
if (audio_language) { if (audio_language) {
pstrcpy(st->language, sizeof(st->language), audio_language); pstrcpy(st->language, sizeof(st->language), audio_language);
av_free(audio_language); av_free(audio_language);
......
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