mp3enc: simplify mp3_write_xing()

[ffmpeg] / libavformat / mp3enc.c

diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index eab483f850e21fa5d9b1b58c3806ed27fdd29e09..3f2f02b9439093602019ed21c315f82e969c3b7d 100644 (file)
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -185,13 +185,11 @@ static int mp3_write_xing(AVFormatContext *s)
     header |= (srate_idx << 2) <<  8;
     header |= channels << 6;
 
-    for (;;) {
+    for (;; bitrate_idx++) {
         if (15 == bitrate_idx)
             return -1;
 
-        mask = (bitrate_idx << 4) <<  8;
-        header |= mask;
-        avpriv_mpegaudio_decode_header(&c, header);
+        avpriv_mpegaudio_decode_header(&c, header | (bitrate_idx << (4+8)));
         xing_offset=xing_offtbl[c.lsf == 1][c.nb_channels == 1];
         needed = 4              // header
                + xing_offset
@@ -203,9 +201,6 @@ static int mp3_write_xing(AVFormatContext *s)
 
         if (needed <= c.frame_size)
             break;
-
-        header &= ~mask;
-        ++bitrate_idx;
     }
 
     avio_wb32(s->pb, header);