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/Makefile | |
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/Makefile')
-rw-r--r-- | libavcodec/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bc4d7dab27..8c878c3699 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,7 +1,8 @@ NAME = avcodec DESC = FFmpeg codec library -HEADERS = avcodec.h \ +HEADERS = ac3_parser.h \ + avcodec.h \ avdct.h \ avfft.h \ d3d11va.h \ @@ -18,7 +19,8 @@ HEADERS = avcodec.h \ vorbis_parser.h \ xvmc.h \ -OBJS = allcodecs.o \ +OBJS = ac3_parser.o \ + allcodecs.o \ avdct.o \ avpacket.o \ avpicture.o \ @@ -955,8 +957,7 @@ OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ aacadtsdec.o mpeg4audio.o -OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o \ - aac_ac3_parser.o +OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o |