diff options
author | Fabrice Bellard <fabrice@bellard.org> | 2003-07-17 10:26:02 +0000 |
---|---|---|
committer | Fabrice Bellard <fabrice@bellard.org> | 2003-07-17 10:26:02 +0000 |
commit | 590403c7023c37a7dd43216446a9780e2add0097 (patch) | |
tree | 166d3b4b2d3b50655aaf8b98ffc95a0b94111c6c /libavformat/yuv4mpeg.c | |
parent | 019ac05ace07ce3e911b90acaee64758028e7375 (diff) | |
download | ffmpeg-streaming-590403c7023c37a7dd43216446a9780e2add0097.zip ffmpeg-streaming-590403c7023c37a7dd43216446a9780e2add0097.tar.gz |
removed warnings
Originally committed as revision 2059 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/yuv4mpeg.c')
-rw-r--r-- | libavformat/yuv4mpeg.c | 96 |
1 files changed, 50 insertions, 46 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 2cdaf9b..7aa35a8 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -26,7 +26,7 @@ static int yuv4_write_header(AVFormatContext *s) { AVStream *st; int width, height; - int raten, rated, aspectn, aspectd, fps, fps1, n, gcd; + int raten, rated, aspectn, aspectd, n; char buf[Y4M_LINE_MAX+1]; if (s->nb_streams != 1) @@ -40,51 +40,55 @@ static int yuv4_write_header(AVFormatContext *s) //this is identical to the code below for exact fps av_reduce(&raten, &rated, st->codec.frame_rate, st->codec.frame_rate_base, (1UL<<31)-1); #else - fps = st->codec.frame_rate; - fps1 = (((float)fps / st->codec.frame_rate_base) * 1000); - - /* Sorry about this messy code, but mpeg2enc is very picky about - * the framerates it accepts. */ - switch(fps1) { - case 23976: - raten = 24000; /* turn the framerate into a ratio */ - rated = 1001; - break; - case 29970: - raten = 30000; - rated = 1001; - break; - case 25000: - raten = 25; - rated = 1; - break; - case 30000: - raten = 30; - rated = 1; - break; - case 24000: - raten = 24; - rated = 1; - break; - case 50000: - raten = 50; - rated = 1; - break; - case 59940: - raten = 60000; - rated = 1001; - break; - case 60000: - raten = 60; - rated = 1; - break; - default: - raten = st->codec.frame_rate; /* this setting should work, but often doesn't */ - rated = st->codec.frame_rate_base; - gcd= av_gcd(raten, rated); - raten /= gcd; - rated /= gcd; - break; + { + int gcd, fps, fps1; + + fps = st->codec.frame_rate; + fps1 = (((float)fps / st->codec.frame_rate_base) * 1000); + + /* Sorry about this messy code, but mpeg2enc is very picky about + * the framerates it accepts. */ + switch(fps1) { + case 23976: + raten = 24000; /* turn the framerate into a ratio */ + rated = 1001; + break; + case 29970: + raten = 30000; + rated = 1001; + break; + case 25000: + raten = 25; + rated = 1; + break; + case 30000: + raten = 30; + rated = 1; + break; + case 24000: + raten = 24; + rated = 1; + break; + case 50000: + raten = 50; + rated = 1; + break; + case 59940: + raten = 60000; + rated = 1001; + break; + case 60000: + raten = 60; + rated = 1; + break; + default: + raten = st->codec.frame_rate; /* this setting should work, but often doesn't */ + rated = st->codec.frame_rate_base; + gcd= av_gcd(raten, rated); + raten /= gcd; + rated /= gcd; + break; + } } #endif |