generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed warnings

Browse Source 
Originally committed as revision 2059 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-07-17 10:26:02 +00:00
parent 019ac05ace
commit 590403c702
2 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mpeg.c
View File

@ -406,7 +406,6 @@ static int mpeg_mux_end(AVFormatContext *ctx)
static int mpegps_probe(AVProbeData *p) static int mpegps_probe(AVProbeData *p)
{ {
int code, c, i; int code, c, i;
const uint8_t *d;
code = 0xff; code = 0xff;
/* we search the first start code. If it is a packet start code, /* we search the first start code. If it is a packet start code,

96
libavformat/yuv4mpeg.c
View File

@ -26,7 +26,7 @@ static int yuv4_write_header(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;
int width, height; int width, height;
int raten, rated, aspectn, aspectd, fps, fps1, n, gcd; int raten, rated, aspectn, aspectd, n;
char buf[Y4M_LINE_MAX+1]; char buf[Y4M_LINE_MAX+1];
if (s->nb_streams != 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 //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); av_reduce(&raten, &rated, st->codec.frame_rate, st->codec.frame_rate_base, (1UL<<31)-1);
#else #else
fps = st->codec.frame_rate; {
fps1 = (((float)fps / st->codec.frame_rate_base) * 1000); int gcd, fps, fps1;
/* Sorry about this messy code, but mpeg2enc is very picky about fps = st->codec.frame_rate;
* the framerates it accepts. */ fps1 = (((float)fps / st->codec.frame_rate_base) * 1000);
switch(fps1) {
case 23976: /* Sorry about this messy code, but mpeg2enc is very picky about
raten = 24000; /* turn the framerate into a ratio */ * the framerates it accepts. */
rated = 1001; switch(fps1) {
break; case 23976:
case 29970: raten = 24000; /* turn the framerate into a ratio */
raten = 30000; rated = 1001;
rated = 1001; break;
break; case 29970:
case 25000: raten = 30000;
raten = 25; rated = 1001;
rated = 1; break;
break; case 25000:
case 30000: raten = 25;
raten = 30; rated = 1;
rated = 1; break;
break; case 30000:
case 24000: raten = 30;
raten = 24; rated = 1;
rated = 1; break;
break; case 24000:
case 50000: raten = 24;
raten = 50; rated = 1;
rated = 1; break;
break; case 50000:
case 59940: raten = 50;
raten = 60000; rated = 1;
rated = 1001; break;
break; case 59940:
case 60000: raten = 60000;
raten = 60; rated = 1001;
rated = 1; break;
break; case 60000:
default: raten = 60;
raten = st->codec.frame_rate; /* this setting should work, but often doesn't */ rated = 1;
rated = st->codec.frame_rate_base; break;
gcd= av_gcd(raten, rated); default:
raten /= gcd; raten = st->codec.frame_rate; /* this setting should work, but often doesn't */
rated /= gcd; rated = st->codec.frame_rate_base;
break; gcd= av_gcd(raten, rated);
raten /= gcd;
rated /= gcd;
break;
}
} }
#endif #endif