diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:25:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:25:58 +0200 |
| commit | d7888ff644f5965b7a54ecefea9af1469fd1d510 (patch) | |
| tree | 3628b3d5ffd3323ccc974f16c478f39d4c7b910d | |
| parent | 86be9cda97d2577165127c3b7075aa6a038995ab (diff) | |
| parent | 78a3a4580c5a547af4ae8682c662ea3a4699a599 (diff) | |
| download | ffmpeg-d7888ff644f5965b7a54ecefea9af1469fd1d510.tar.gz | |
Merge commit '78a3a4580c5a547af4ae8682c662ea3a4699a599' into release/2.4
* commit '78a3a4580c5a547af4ae8682c662ea3a4699a599':
mp3: Properly use AVCodecContext API
Conflicts:
libavformat/mp3dec.c
See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mp3dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index b3a78d0d8a..dab0aad228 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -32,6 +32,7 @@ #include "id3v1.h" #include "replaygain.h" +#include "libavcodec/avcodec.h" #include "libavcodec/mpegaudiodecheader.h" #define XING_FLAG_FRAMES 0x01 @@ -64,7 +65,7 @@ static int mp3_read_probe(AVProbeData *p) AVCodecContext *avctx = avcodec_alloc_context3(NULL); if (!avctx) - return 0; + return AVERROR(ENOMEM); buf0 = p->buf; end = p->buf + p->buf_size - sizeof(uint32_t); @@ -81,7 +82,8 @@ static int mp3_read_probe(AVProbeData *p) for(frames = 0; buf2 < end; frames++) { header = AV_RB32(buf2); - fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate); + fsize = avpriv_mpa_decode_header(avctx, header, + &sample_rate, &sample_rate, &sample_rate, &sample_rate); if(fsize < 0) break; buf2 += fsize; |