[FFmpeg-cvslog] avformat/mp3enc: drop redundant and uninitialized variable

Michael Niedermayer git at videolan.org
Thu Jun 19 21:21:17 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 20:03:24 2014 +0200| [f378636d90af664e162f75c295167078e3a97360] | committer: Michael Niedermayer

avformat/mp3enc: drop redundant and uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit eccec203978e53f897a3c6105d011bbdff2a978b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mp3enc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 0eecdb7..9c9bd5e 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -124,7 +124,7 @@ static int mp3_write_xing(AVFormatContext *s)
     int best_bitrate_error = INT_MAX;
     int xing_offset;
     int ver = 0;
-    int bytes_needed, lsf;
+    int bytes_needed;
     const char *vendor = (codec->flags & CODEC_FLAG_BITEXACT) ? "Lavf" : LIBAVFORMAT_IDENT;
 
     if (!s->pb->seekable || !mp3->write_xing)
@@ -161,7 +161,7 @@ static int mp3_write_xing(AVFormatContext *s)
     header |= channels << 6;
 
     for (bitrate_idx = 1; bitrate_idx < 15; bitrate_idx++) {
-        int bit_rate = 1000 * avpriv_mpa_bitrate_tab[lsf][3 - 1][bitrate_idx];
+        int bit_rate = 1000 * avpriv_mpa_bitrate_tab[ver != 3][3 - 1][bitrate_idx];
         int error    = FFABS(bit_rate - codec->bit_rate);
 
         if (error < best_bitrate_error) {



More information about the ffmpeg-cvslog mailing list