diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-27 19:52:19 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-28 00:15:37 +0300 |
| commit | e0250cf3651e6417e0117486a7816b45fb2d34cd (patch) | |
| tree | fd04f7310c17247d93843ea177ef6f9d644296c4 /libavcodec/ac3dec.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/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index c393076aec..244a18323f 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -36,7 +36,7 @@ #include "bswapdsp.h" #include "internal.h" #include "aac_ac3_parser.h" -#include "ac3_parser.h" +#include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" #include "kbdwin.h" @@ -297,10 +297,10 @@ static int ac3_parse_header(AC3DecodeContext *s) */ static int parse_frame_header(AC3DecodeContext *s) { - AC3HeaderInfo hdr, *phdr=&hdr; + AC3HeaderInfo hdr; int err; - err = avpriv_ac3_parse_header(&s->gbc, &phdr); + err = ff_ac3_parse_header(&s->gbc, &hdr); if (err) return err; |