The latter does not require a full AVCodecContext and still provides all
the functionality needed here.
---
libavformat/mp3dec.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 6876c2c..e1b0bb2 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -53,13 +53,9 @@ typedef struct MP3DecContext {
static int mp3_read_probe(AVProbeData *p)
{
int max_frames, first_frames = 0;
- int fsize, frames, sample_rate;
+ int frames, ret;
uint32_t header;
uint8_t *buf, *buf0, *buf2, *end;
- AVCodecContext *avctx = avcodec_alloc_context3(NULL);
-
- if (!avctx)
- return AVERROR(ENOMEM);
buf0 = p->buf;
end = p->buf + p->buf_size - sizeof(uint32_t);
@@ -73,19 +69,18 @@ static int mp3_read_probe(AVProbeData *p)
buf2 = buf;
for(frames = 0; buf2 < end; frames++) {
+ MPADecodeHeader h;
+
header = AV_RB32(buf2);
- fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate,
- &sample_rate, &sample_rate,
- &sample_rate);
- if(fsize < 0)
+ ret = avpriv_mpegaudio_decode_header(&h, header);
+ if (ret != 0)
break;
- buf2 += fsize;
+ buf2 += h.frame_size;
}
max_frames = FFMAX(max_frames, frames);
if(buf == buf0)
first_frames= frames;
}
- avcodec_free_context(&avctx);
// keep this in sync with ac3 probe, both need to avoid
// issues with MPEG-files!
if (first_frames >= 10)
--
2.0.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
