RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28' 

* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
	libavformat/mp3enc.c

See: 2dd0da787c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-23 03:34:13 +02:00
parent 2bcf34a0ef f2f2e7627f
commit ca350378de
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libmp3lame.c
View File

@ -183,6 +183,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
MPADecodeHeader hdr; MPADecodeHeader hdr;
int len, ret, ch; int len, ret, ch;
int lame_result; int lame_result;
uint32_t h;
if (frame) { if (frame) {
switch (avctx->sample_fmt) { switch (avctx->sample_fmt) {
@ -240,7 +241,12 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
determine the frame size. */ determine the frame size. */
if (s->buffer_index < 4) if (s->buffer_index < 4)
return 0; return 0;
if (avpriv_mpegaudio_decode_header(&hdr, AV_RB32(s->buffer))) { h = AV_RB32(s->buffer);
if (ff_mpa_check_header(h) < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid mp3 header at start of buffer\n");
return AVERROR_BUG;
}
if (avpriv_mpegaudio_decode_header(&hdr, h)) {
av_log(avctx, AV_LOG_ERROR, "free format output not supported\n"); av_log(avctx, AV_LOG_ERROR, "free format output not supported\n");
return -1; return -1;
} }

20
libavformat/mp3enc.c
View File

@ -262,19 +262,19 @@ static int mp3_write_audio_packet(AVFormatContext *s, AVPacket *pkt)
if (pkt->data && pkt->size >= 4) { if (pkt->data && pkt->size >= 4) {
MPADecodeHeader mpah; MPADecodeHeader mpah;
int av_unused base; int av_unused base;
uint32_t head = AV_RB32(pkt->data); uint32_t h;
if (ff_mpa_check_header(head) < 0) { h = AV_RB32(pkt->data);
if (ff_mpa_check_header(h) == 0) {
avpriv_mpegaudio_decode_header(&mpah, h);
if (!mp3->initial_bitrate)
mp3->initial_bitrate = mpah.bit_rate;
if ((mpah.bit_rate == 0) || (mp3->initial_bitrate != mpah.bit_rate))
mp3->has_variable_bitrate = 1;
} else {
av_log(s, AV_LOG_WARNING, "Audio packet of size %d (starting with %08X...) " av_log(s, AV_LOG_WARNING, "Audio packet of size %d (starting with %08X...) "
"is invalid, writing it anyway.\n", pkt->size, head); "is invalid, writing it anyway.\n", pkt->size, h);
return ff_raw_write_packet(s, pkt);
} }
avpriv_mpegaudio_decode_header(&mpah, head);
if (!mp3->initial_bitrate)
mp3->initial_bitrate = mpah.bit_rate;
if ((mpah.bit_rate == 0) || (mp3->initial_bitrate != mpah.bit_rate))
mp3->has_variable_bitrate = 1;
#ifdef FILTER_VBR_HEADERS #ifdef FILTER_VBR_HEADERS
/* filter out XING and INFO headers. */ /* filter out XING and INFO headers. */