aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-22 07:13:29 +0100
committerAnton Khirnov <anton@khirnov.net>2011-11-23 22:01:32 +0100
commitffa0674e5a3bc839c28794eedaa0b3151e7fe5f2 (patch)
treeafe1524a77d15b60f9334c73f5a7b2f8bed149a4 /avconv.c
parentaf8ad892bf846425a86872d01162a59a6a31337c (diff)
downloadffmpeg-ffa0674e5a3bc839c28794eedaa0b3151e7fe5f2.tar.gz
avconv: declare some variables in blocks where they are used
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/avconv.c b/avconv.c
index 1c17be81b2..c31aa459ed 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;