summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-11-06 21:54:23 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-11-06 21:54:23 +0000
commit4408e75e020cae9358f0649916e03268097a4715 (patch)
tree936127121c1cc3e1d739866727865649a274b0aa /ffmpeg.c
parent1c75f2bc5be757babd985ce12ca5e3b470621d1e (diff)
2nd try for -vcodec copy timebase selection last one choose 1fps due to broken opendivx stream in avi (avi had the correct 15fps)
Originally committed as revision 6920 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 84750c6c25..6f7b381cfc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1538,7 +1538,7 @@ static int av_encode(AVFormatContext **output_files,
codec->bit_rate = icodec->bit_rate;
codec->extradata= icodec->extradata;
codec->extradata_size= icodec->extradata_size;
- if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base))
+ if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000)
codec->time_base = icodec->time_base;
else
codec->time_base = ist->st->time_base;