diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:16:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:27:48 +0200 |
| commit | b0ba2bf8c66fdae9761b36647b813c830984fb6c (patch) | |
| tree | ddd021d6f0082139baac1bd50ff4f54bf4016dc9 | |
| parent | 8d14596bc241b32aa08a6885c7c1dbfcd0566948 (diff) | |
| parent | fab694dd3931b1c0bc3c598c3f88b1902c14a303 (diff) | |
| download | ffmpeg-b0ba2bf8c66fdae9761b36647b813c830984fb6c.tar.gz | |
Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
lavf: move a variable declaration to the block where it's used
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 16741d8919..5998a3fa72 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2214,12 +2214,12 @@ static void fill_all_stream_timings(AVFormatContext *ic) static void estimate_timings_from_bit_rate(AVFormatContext *ic) { int64_t filesize, duration; - int bit_rate, i, show_warning = 0; + int i, show_warning = 0; AVStream *st; /* if bit_rate is already set, we believe it */ if (ic->bit_rate <= 0) { - bit_rate = 0; + int bit_rate = 0; for(i=0;i<ic->nb_streams;i++) { st = ic->streams[i]; if (st->codec->bit_rate > 0) |