[FFmpeg-cvslog] avconv: declare some variables in blocks where they are used

Anton Khirnov git at videolan.org
Thu Nov 24 03:38:33 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 22 07:13:29 2011 +0100| [ffa0674e5a3bc839c28794eedaa0b3151e7fe5f2] | committer: Anton Khirnov

avconv: declare some variables in blocks where they are used

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffa0674e5a3bc839c28794eedaa0b3151e7fe5f2
---

 avconv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/avconv.c b/avconv.c
index 1c17be8..c31aa45 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1840,8 +1840,7 @@ static int output_packet(InputStream *ist, int ist_index,
                          OutputStream *ost_table, int nb_ostreams,
                          const AVPacket *pkt)
 {
-    OutputStream *ost;
-    int ret = 0, i;
+    int i;
     int got_output;
     int64_t pkt_pts = AV_NOPTS_VALUE;
 
@@ -1867,6 +1866,7 @@ static int output_packet(InputStream *ist, int ist_index,
 
     //while we have more to decode or while the decoder did output something on EOF
     while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
+        int ret = 0;
     handle_eof:
         ist->pts= ist->next_pts;
 
@@ -1917,7 +1917,7 @@ static int output_packet(InputStream *ist, int ist_index,
         }
     }
     for (i = 0; pkt && i < nb_ostreams; i++) {
-        ost = &ost_table[i];
+        OutputStream *ost = &ost_table[i];
 
         if (!check_output_constraints(ist, ost) || ost->encoding_needed)
             continue;



More information about the ffmpeg-cvslog mailing list