mirror of https://git.ffmpeg.org/ffmpeg.git
mp3enc: fix "warning: best_bitrate_idx may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
1e44dda825
commit
4dbdd3ec6f
|
@ -35,6 +35,7 @@
|
||||||
#include "libavcodec/mpegaudiodecheader.h"
|
#include "libavcodec/mpegaudiodecheader.h"
|
||||||
#include "libavformat/avio_internal.h"
|
#include "libavformat/avio_internal.h"
|
||||||
#include "libavutil/dict.h"
|
#include "libavutil/dict.h"
|
||||||
|
#include "libavutil/avassert.h"
|
||||||
|
|
||||||
static int id3v1_set_string(AVFormatContext *s, const char *key,
|
static int id3v1_set_string(AVFormatContext *s, const char *key,
|
||||||
uint8_t *buf, int buf_size)
|
uint8_t *buf, int buf_size)
|
||||||
|
@ -157,7 +158,7 @@ static int mp3_write_xing(AVFormatContext *s)
|
||||||
AVCodecContext *codec = s->streams[0]->codec;
|
AVCodecContext *codec = s->streams[0]->codec;
|
||||||
MP3Context *mp3 = s->priv_data;
|
MP3Context *mp3 = s->priv_data;
|
||||||
int bitrate_idx;
|
int bitrate_idx;
|
||||||
int best_bitrate_idx;
|
int best_bitrate_idx = -1;
|
||||||
int best_bitrate_error= INT_MAX;
|
int best_bitrate_error= INT_MAX;
|
||||||
int64_t xing_offset;
|
int64_t xing_offset;
|
||||||
int32_t header, mask;
|
int32_t header, mask;
|
||||||
|
@ -196,6 +197,7 @@ static int mp3_write_xing(AVFormatContext *s)
|
||||||
best_bitrate_idx = bitrate_idx;
|
best_bitrate_idx = bitrate_idx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
av_assert0(best_bitrate_idx >= 0);
|
||||||
|
|
||||||
for (bitrate_idx= best_bitrate_idx;; bitrate_idx++) {
|
for (bitrate_idx= best_bitrate_idx;; bitrate_idx++) {
|
||||||
if (15 == bitrate_idx)
|
if (15 == bitrate_idx)
|
||||||
|
|
Loading…
Reference in New Issue