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/eac3dec.c | |
| parent | 5834cba05efbfd24dadedd187753f244ad7e0cab (diff) | |
| parent | 50a1c66cf6ab7eb683daaa9e2da3869fa3a54609 (diff) | |
| download | ffmpeg-e0250cf3651e6417e0117486a7816b45fb2d34cd.tar.gz | |
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/eac3dec.c')
| -rw-r--r-- | libavcodec/eac3dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index c971879b2d..6f6309f179 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -48,7 +48,6 @@ #include "internal.h" #include "aac_ac3_parser.h" #include "ac3.h" -#include "ac3_parser.h" #include "ac3dec.h" #include "ac3dec_data.h" #include "eac3_data.h" |