removed warnings

Originally committed as revision 2059 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 50 insertions, 47 deletions

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 68efa86c5e..0c34769358 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -406,7 +406,6 @@ static int mpeg_mux_end(AVFormatContext *ctx)
 static int mpegps_probe(AVProbeData *p)
 {
     int code, c, i;
-    const uint8_t *d;
 
     code = 0xff;
     /* we search the first start code. If it is a packet start code,
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 2cdaf9b097..7aa35a8687 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