diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/adtsenc.c | 2 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 2 | ||||
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/latmenc.c | 2 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 55fece5dd6..ef3d8e2c21 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -37,7 +37,7 @@ int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf int off; init_get_bits(&gb, buf, size * 8); - off = avpriv_mpeg4audio_get_config(&m4ac, buf, size); + off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); if (off < 0) return off; skip_bits_long(&gb, off); diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 5d19dd8413..51a8126904 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -534,7 +534,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) if (st->codec->codec_id == CODEC_ID_AAC) { MPEG4AudioConfig cfg; avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, - st->codec->extradata_size); + st->codec->extradata_size * 8, 1); st->codec->channels = cfg.channels; if (cfg.ext_sample_rate) st->codec->sample_rate = cfg.ext_sample_rate; diff --git a/libavformat/isom.c b/libavformat/isom.c index b0eef375c6..7b9f91b58a 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -436,7 +436,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext if (st->codec->codec_id == CODEC_ID_AAC) { MPEG4AudioConfig cfg; avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, - st->codec->extradata_size); + st->codec->extradata_size * 8, 1); st->codec->channels = cfg.channels; if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4 st->codec->sample_rate = avpriv_mpa_freq_tab[cfg.sampling_index]; diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 679f2cc9c6..423710ddea 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -54,7 +54,7 @@ static int latm_decode_extradata(LATMContext *ctx, uint8_t *buf, int size) MPEG4AudioConfig m4ac; init_get_bits(&gb, buf, size * 8); - ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size); + ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); if (ctx->off < 0) return ctx->off; skip_bits_long(&gb, ctx->off); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b8c73bf950..9f8d5d853b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -448,7 +448,8 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int { MPEG4AudioConfig mp4ac; - if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, codec->extradata_size) < 0) { + if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, + codec->extradata_size * 8, 1) < 0) { av_log(s, AV_LOG_WARNING, "Error parsing AAC extradata, unable to determine samplerate.\n"); return; } |