diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-27 13:52:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-27 18:15:37 -0300 |
| commit | e0250cf3651e6417e0117486a7816b45fb2d34cd (patch) | |
| tree | fd04f7310c17247d93843ea177ef6f9d644296c4 /libavcodec/audiotoolboxdec.c | |
| parent | 5834cba05efbfd24dadedd187753f244ad7e0cab (diff) | |
| parent | 50a1c66cf6ab7eb683daaa9e2da3869fa3a54609 (diff) | |
Merge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'
* commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609':
ac3_parser: add a public function for parsing the data required by the demuxer
avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/audiotoolboxdec.c')
| -rw-r--r-- | libavcodec/audiotoolboxdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 607d3ba4d4..a149949aba 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -350,10 +350,10 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt) } else if (pkt && pkt->size >= 7 && (avctx->codec_id == AV_CODEC_ID_AC3 || avctx->codec_id == AV_CODEC_ID_EAC3)) { - AC3HeaderInfo hdr, *phdr = &hdr; + AC3HeaderInfo hdr; GetBitContext gbc; init_get_bits(&gbc, pkt->data, pkt->size); - if (avpriv_ac3_parse_header(&gbc, &phdr) < 0) + if (ff_ac3_parse_header(&gbc, &hdr) < 0) return AVERROR_INVALIDDATA; in_format.mSampleRate = hdr.sample_rate; in_format.mChannelsPerFrame = hdr.channels; |