removed warnings
Originally committed as revision 2059 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
019ac05ace
commit
590403c702
@ -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,
|
||||||
|
@ -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,6 +40,9 @@ 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
|
||||||
|
{
|
||||||
|
int gcd, fps, fps1;
|
||||||
|
|
||||||
fps = st->codec.frame_rate;
|
fps = st->codec.frame_rate;
|
||||||
fps1 = (((float)fps / st->codec.frame_rate_base) * 1000);
|
fps1 = (((float)fps / st->codec.frame_rate_base) * 1000);
|
||||||
|
|
||||||
@ -86,6 +89,7 @@ static int yuv4_write_header(AVFormatContext *s)
|
|||||||
rated /= gcd;
|
rated /= gcd;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
aspectn = 1;
|
aspectn = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user