X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Flibmp3lame.c;h=e4d0e001032dd2a7b8ea3d854e57beceb77feab6;hp=966212dcae8146cbaf44303ba1df6f063122536b;hb=955aec3c7c7be39b659197e1ec379a09f2b7c41c;hpb=cea1eef25c3310a68dd327eb74aae14ad3c2ddef;ds=sidebyside diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 966212dcae..e4d0e00103 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -239,11 +239,12 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (s->buffer_index < 4) return 0; h = AV_RB32(s->buffer); - if (ff_mpa_check_header(h) < 0) { + + ret = avpriv_mpegaudio_decode_header(&hdr, h); + if (ret < 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)) { + } else if (ret) { av_log(avctx, AV_LOG_ERROR, "free format output not supported\n"); return -1; }