be more flexible with frame rate check

Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-02 23:37:03 +00:00
parent be62f5569e
commit 33abc1a73a
1 changed files with 4 additions and 2 deletions

View File

@ -32,6 +32,8 @@
//#define DEBUG //#define DEBUG
#include <math.h>
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "mxf.h" #include "mxf.h"
@ -1117,10 +1119,10 @@ static int mxf_write_header(AVFormatContext *s)
st->priv_data = sc; st->priv_data = sc;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) { if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
if (!av_cmp_q(st->codec->time_base, (AVRational){ 1, 25 })) { if (fabs(av_q2d(st->codec->time_base) - 1/25.0) < 0.0001) {
samples_per_frame = PAL_samples_per_frame; samples_per_frame = PAL_samples_per_frame;
mxf->time_base = (AVRational){ 1, 25 }; mxf->time_base = (AVRational){ 1, 25 };
} else if (!av_cmp_q(st->codec->time_base, (AVRational){ 1001, 30000 })) { } else if (fabs(av_q2d(st->codec->time_base) - 1001/30000.0) < 0.0001) {
samples_per_frame = NTSC_samples_per_frame; samples_per_frame = NTSC_samples_per_frame;
mxf->time_base = (AVRational){ 1001, 30000 }; mxf->time_base = (AVRational){ 1001, 30000 };
} else { } else {