Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e1dc5358
Commit
e1dc5358
authored
Dec 03, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Create a component for MPEG audio header decoding
Fixes standalone compilation of the libmp3lame encoder.
parent
0fdc9f81
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
configure
configure
+5
-2
Makefile
libavcodec/Makefile
+4
-6
No files found.
configure
View file @
e1dc5358
...
...
@@ -1724,6 +1724,7 @@ CONFIG_EXTRA="
mpeg_er
mpegaudio
mpegaudiodsp
mpegaudioheader
mpegvideo
mpegvideoenc
mss34dsp
...
...
@@ -1907,7 +1908,7 @@ mdct_select="fft"
rdft_select
=
"fft"
me_cmp_select
=
"fdctdsp idctdsp pixblockdsp"
mpeg_er_select
=
"error_resilience"
mpegaudio_select
=
"mpegaudiodsp"
mpegaudio_select
=
"mpegaudiodsp
mpegaudioheader
"
mpegaudiodsp_select
=
"dct"
mpegvideo_select
=
"blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp"
mpegvideoenc_select
=
"me_cmp mpegvideo pixblockdsp qpeldsp"
...
...
@@ -2229,6 +2230,7 @@ nvenc_hevc_encoder_deps="nvenc"
# parsers
h264_parser_select
=
"golomb h264dsp h264parse"
hevc_parser_select
=
"golomb"
mpegaudio_parser_select
=
"mpegaudioheader"
mpegvideo_parser_select
=
"mpegvideo"
mpeg4video_parser_select
=
"error_resilience h263dsp mpegvideo qpeldsp"
vc1_parser_select
=
"vc1dsp"
...
...
@@ -2251,7 +2253,7 @@ libilbc_decoder_deps="libilbc"
libilbc_encoder_deps
=
"libilbc"
libkvazaar_encoder_deps
=
"libkvazaar"
libmp3lame_encoder_deps
=
"libmp3lame"
libmp3lame_encoder_select
=
"audio_frame_queue"
libmp3lame_encoder_select
=
"audio_frame_queue
mpegaudioheader
"
libopencore_amrnb_decoder_deps
=
"libopencore_amrnb"
libopencore_amrnb_encoder_deps
=
"libopencore_amrnb"
libopencore_amrnb_encoder_select
=
"audio_frame_queue"
...
...
@@ -2319,6 +2321,7 @@ mov_demuxer_select="iso_media riffdec"
mov_demuxer_suggest
=
"zlib"
mov_muxer_select
=
"iso_media riffenc rtpenc_chain"
mp3_demuxer_select
=
"mpegaudio_parser"
mp3_muxer_select
=
"mpegaudioheader"
mp4_muxer_select
=
"mov_muxer"
mpegts_demuxer_select
=
"iso_media"
mpegts_muxer_select
=
"adts_muxer latm_muxer"
...
...
libavcodec/Makefile
View file @
e1dc5358
...
...
@@ -82,12 +82,12 @@ OBJS-$(CONFIG_LZF) += lzf.o
OBJS-$(CONFIG_MDCT)
+=
mdct_fixed.o
mdct_float.o
OBJS-$(CONFIG_ME_CMP)
+=
me_cmp.o
OBJS-$(CONFIG_MPEG_ER)
+=
mpeg_er.o
OBJS-$(CONFIG_MPEGAUDIO)
+=
mpegaudio.o
mpegaudiodata.o
\
mpegaudiodecheader.o
OBJS-$(CONFIG_MPEGAUDIO)
+=
mpegaudio.o
OBJS-$(CONFIG_MPEGAUDIODSP)
+=
mpegaudiodsp.o
\
mpegaudiodsp_data.o
\
mpegaudiodsp_fixed.o
\
mpegaudiodsp_float.o
OBJS-$(CONFIG_MPEGAUDIOHEADER)
+=
mpegaudiodecheader.o
mpegaudiodata.o
OBJS-$(CONFIG_MPEGVIDEO)
+=
mpegvideo.o
mpegvideodsp.o
rl.o
\
mpegvideo_motion.o
mpegutils.o
\
mpegvideodata.o
mpegpicture.o
...
...
@@ -651,7 +651,6 @@ OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_MATROSKA_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_MOV_DEMUXER)
+=
ac3tab.o
OBJS-$(CONFIG_MP3_MUXER)
+=
mpegaudiodata.o
mpegaudiodecheader.o
OBJS-$(CONFIG_NUT_MUXER)
+=
mpegaudiodata.o
OBJS-$(CONFIG_SPDIF_DEMUXER)
+=
aacadtsdec.o
mpeg4audio.o
OBJS-$(CONFIG_SPDIF_MUXER)
+=
dca.o
...
...
@@ -670,7 +669,7 @@ OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsmenc.o
OBJS-$(CONFIG_LIBILBC_DECODER)
+=
libilbc.o
OBJS-$(CONFIG_LIBILBC_ENCODER)
+=
libilbc.o
OBJS-$(CONFIG_LIBKVAZAAR_ENCODER)
+=
libkvazaar.o
OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
+=
libmp3lame.o
mpegaudiodecheader.o
OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
+=
libmp3lame.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)
+=
libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)
+=
libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)
+=
libopencore-amr.o
...
...
@@ -733,8 +732,7 @@ OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o
OBJS-$(CONFIG_MPEG4VIDEO_PARSER)
+=
mpeg4video_parser.o
h263.o
\
mpeg4videodec.o
mpeg4video.o
\
ituh263dec.o
h263dec.o
h263data.o
OBJS-$(CONFIG_MPEGAUDIO_PARSER)
+=
mpegaudio_parser.o
\
mpegaudiodecheader.o
mpegaudiodata.o
OBJS-$(CONFIG_MPEGAUDIO_PARSER)
+=
mpegaudio_parser.o
OBJS-$(CONFIG_MPEGVIDEO_PARSER)
+=
mpegvideo_parser.o
\
mpeg12.o
mpeg12data.o
OBJS-$(CONFIG_OPUS_PARSER)
+=
opus_parser.o
opus.o
vorbis_data.o
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment