[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.344,1.345

Michael Niedermayer CVS michael
Sun Sep 4 11:00:49 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv21770

Modified Files:
	ffmpeg.c 
Log Message:
the user sets codec->time_base for video encding so she should also set it for audio encoding


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- ffmpeg.c	2 Sep 2005 19:16:48 -0000	1.344
+++ ffmpeg.c	4 Sep 2005 09:00:47 -0000	1.345
@@ -1683,6 +1683,7 @@
             codec->bit_rate = icodec->bit_rate;
             codec->extradata= icodec->extradata;
             codec->extradata_size= icodec->extradata_size;
+            codec->time_base = icodec->time_base;
             switch(codec->codec_type) {
             case CODEC_TYPE_AUDIO:
                 codec->sample_rate = icodec->sample_rate;
@@ -1691,7 +1692,6 @@
                 codec->block_align= icodec->block_align;
                 break;
             case CODEC_TYPE_VIDEO:
-                codec->time_base = icodec->time_base;
                 codec->width = icodec->width;
                 codec->height = icodec->height;
                 codec->has_b_frames = icodec->has_b_frames;
@@ -3531,6 +3531,7 @@
             audio_enc->channels = audio_channels;
     }
     audio_enc->sample_rate = audio_sample_rate;
+    audio_enc->time_base= (AVRational){1, audio_sample_rate};
     if (audio_language) {
         pstrcpy(st->language, sizeof(st->language), audio_language);
         av_free(audio_language);





More information about the ffmpeg-cvslog mailing list