Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
624e2355
Commit
624e2355
authored
Feb 16, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Introduce iso_media component
parent
82454c3a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
26 deletions
+26
-26
configure
configure
+9
-7
Makefile
libavcodec/Makefile
+5
-9
Makefile
libavformat/Makefile
+12
-10
No files found.
configure
View file @
624e2355
...
@@ -1706,6 +1706,7 @@ CONFIG_EXTRA="
...
@@ -1706,6 +1706,7 @@ CONFIG_EXTRA="
iirfilter
iirfilter
imdct15
imdct15
intrax8
intrax8
iso_media
ividsp
ividsp
jpegtables
jpegtables
libx262
libx262
...
@@ -2249,11 +2250,11 @@ ac3_demuxer_select="ac3_parser"
...
@@ -2249,11 +2250,11 @@ ac3_demuxer_select="ac3_parser"
asf_demuxer_select
=
"riffdec"
asf_demuxer_select
=
"riffdec"
asf_muxer_select
=
"riffenc"
asf_muxer_select
=
"riffenc"
asf_stream_muxer_select
=
"asf_muxer"
asf_stream_muxer_select
=
"asf_muxer"
avi_demuxer_select
=
"riffdec"
avi_demuxer_select
=
"
iso_media
riffdec"
avi_muxer_select
=
"riffenc"
avi_muxer_select
=
"riffenc"
avisynth_demuxer_deps
=
"avisynth"
avisynth_demuxer_deps
=
"avisynth"
avisynth_demuxer_select
=
"riffdec"
avisynth_demuxer_select
=
"riffdec"
caf_demuxer_select
=
"riffdec"
caf_demuxer_select
=
"
iso_media
riffdec"
dash_muxer_select
=
"mp4_muxer"
dash_muxer_select
=
"mp4_muxer"
dirac_demuxer_select
=
"dirac_parser"
dirac_demuxer_select
=
"dirac_parser"
dv_demuxer_select
=
"dvprofile"
dv_demuxer_select
=
"dvprofile"
...
@@ -2267,15 +2268,16 @@ hls_muxer_select="mpegts_muxer"
...
@@ -2267,15 +2268,16 @@ hls_muxer_select="mpegts_muxer"
ipod_muxer_select
=
"mov_muxer"
ipod_muxer_select
=
"mov_muxer"
ismv_muxer_select
=
"mov_muxer"
ismv_muxer_select
=
"mov_muxer"
matroska_audio_muxer_select
=
"matroska_muxer"
matroska_audio_muxer_select
=
"matroska_muxer"
matroska_demuxer_select
=
"riffdec"
matroska_demuxer_select
=
"
iso_media
riffdec"
matroska_demuxer_suggest
=
"bzlib lzo zlib"
matroska_demuxer_suggest
=
"bzlib lzo zlib"
matroska_muxer_select
=
"riffenc"
matroska_muxer_select
=
"
iso_media
riffenc"
mmf_muxer_select
=
"riffenc"
mmf_muxer_select
=
"riffenc"
mov_demuxer_select
=
"riffdec"
mov_demuxer_select
=
"
iso_media
riffdec"
mov_demuxer_suggest
=
"zlib"
mov_demuxer_suggest
=
"zlib"
mov_muxer_select
=
"riffenc rtpenc_chain"
mov_muxer_select
=
"
iso_media
riffenc rtpenc_chain"
mp3_demuxer_select
=
"mpegaudio_parser"
mp3_demuxer_select
=
"mpegaudio_parser"
mp4_muxer_select
=
"mov_muxer"
mp4_muxer_select
=
"mov_muxer"
mpegts_demuxer_select
=
"iso_media"
mpegts_muxer_select
=
"adts_muxer latm_muxer"
mpegts_muxer_select
=
"adts_muxer latm_muxer"
mpegtsraw_demuxer_select
=
"mpegts_demuxer"
mpegtsraw_demuxer_select
=
"mpegts_demuxer"
mxf_d10_muxer_select
=
"mxf_muxer"
mxf_d10_muxer_select
=
"mxf_muxer"
...
@@ -2302,7 +2304,7 @@ tgp_muxer_select="mov_muxer"
...
@@ -2302,7 +2304,7 @@ tgp_muxer_select="mov_muxer"
w64_demuxer_select
=
"wav_demuxer"
w64_demuxer_select
=
"wav_demuxer"
wav_demuxer_select
=
"riffdec"
wav_demuxer_select
=
"riffdec"
wav_muxer_select
=
"riffenc"
wav_muxer_select
=
"riffenc"
webm_muxer_select
=
"riffenc"
webm_muxer_select
=
"
iso_media
riffenc"
webm_muxer_suggest
=
"libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
webm_muxer_suggest
=
"libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
wtv_demuxer_select
=
"mpegts_demuxer riffdec"
wtv_demuxer_select
=
"mpegts_demuxer riffdec"
xmv_demuxer_select
=
"riffdec"
xmv_demuxer_select
=
"riffdec"
...
...
libavcodec/Makefile
View file @
624e2355
...
@@ -620,26 +620,22 @@ OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
...
@@ -620,26 +620,22 @@ OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)
+=
vdpau_vc1.o
OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)
+=
vdpau_vc1.o
# libavformat dependencies
# libavformat dependencies
OBJS-$(CONFIG_ISO_MEDIA)
+=
mpeg4audio.o
mpegaudiodata.o
OBJS-$(CONFIG_ADTS_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_ADTS_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_CAF_DEMUXER)
+=
mpeg4audio.o
mpegaudiodata.o
\
OBJS-$(CONFIG_CAF_DEMUXER)
+=
ac3tab.o
ac3tab.o
OBJS-$(CONFIG_FLAC_MUXER)
+=
flac.o
flacdata.o
OBJS-$(CONFIG_FLAC_MUXER)
+=
flac.o
flacdata.o
OBJS-$(CONFIG_FLV_DEMUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_FLV_DEMUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_GXF_DEMUXER)
+=
mpeg12data.o
OBJS-$(CONFIG_GXF_DEMUXER)
+=
mpeg12data.o
OBJS-$(CONFIG_IFF_DEMUXER)
+=
iff.o
OBJS-$(CONFIG_IFF_DEMUXER)
+=
iff.o
OBJS-$(CONFIG_ISMV_MUXER)
+=
mpeg4audio.o
mpegaudiodata.o
OBJS-$(CONFIG_LATM_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_LATM_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)
+=
mpeg4audio.o
\
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)
+=
mpeg4audio.o
\
flac.o
flacdata.o
flac.o
flacdata.o
OBJS-$(CONFIG_MATROSKA_DEMUXER)
+=
mpeg4audio.o
mpegaudiodata.o
OBJS-$(CONFIG_MATROSKA_MUXER)
+=
flac.o
flacdata.o
OBJS-$(CONFIG_MATROSKA_MUXER)
+=
mpeg4audio.o
mpegaudiodata.o
\
flac.o
flacdata.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mpegaudiodata.o
mpegaudiodecheader.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mpegaudiodata.o
mpegaudiodecheader.o
OBJS-$(CONFIG_MP3_MUXER)
+=
mpegaudiodata.o
mpegaudiodecheader.o
OBJS-$(CONFIG_MP3_MUXER)
+=
mpegaudiodata.o
mpegaudiodecheader.o
OBJS-$(CONFIG_MOV_DEMUXER)
+=
mpeg4audio.o
mpegaudiodata.o
ac3tab.o
OBJS-$(CONFIG_MOV_DEMUXER)
+=
ac3tab.o
OBJS-$(CONFIG_MOV_MUXER)
+=
mpeg4audio.o
mpegaudiodata.o
OBJS-$(CONFIG_MPEGTS_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_MPEGTS_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_MPEGTS_DEMUXER)
+=
mpeg4audio.o
mpegaudiodata.o
OBJS-$(CONFIG_NUT_MUXER)
+=
mpegaudiodata.o
OBJS-$(CONFIG_NUT_MUXER)
+=
mpegaudiodata.o
OBJS-$(CONFIG_OGG_DEMUXER)
+=
mpeg12data.o
\
OBJS-$(CONFIG_OGG_DEMUXER)
+=
mpeg12data.o
\
dirac.o
dirac.o
...
...
libavformat/Makefile
View file @
624e2355
...
@@ -22,6 +22,8 @@ OBJS = allformats.o \
...
@@ -22,6 +22,8 @@ OBJS = allformats.o \
url.o
\
url.o
\
utils.o
\
utils.o
\
# subsystems
OBJS-$(CONFIG_ISO_MEDIA)
+=
isom.o
OBJS-$(CONFIG_NETWORK)
+=
network.o
OBJS-$(CONFIG_NETWORK)
+=
network.o
OBJS-$(CONFIG_RIFFDEC)
+=
riffdec.o
OBJS-$(CONFIG_RIFFDEC)
+=
riffdec.o
OBJS-$(CONFIG_RIFFENC)
+=
riffenc.o
OBJS-$(CONFIG_RIFFENC)
+=
riffenc.o
...
@@ -78,7 +80,7 @@ OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
...
@@ -78,7 +80,7 @@ OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
OBJS-$(CONFIG_ASS_MUXER)
+=
assenc.o
OBJS-$(CONFIG_ASS_MUXER)
+=
assenc.o
OBJS-$(CONFIG_AU_DEMUXER)
+=
au.o
pcm.o
OBJS-$(CONFIG_AU_DEMUXER)
+=
au.o
pcm.o
OBJS-$(CONFIG_AU_MUXER)
+=
au.o
rawenc.o
OBJS-$(CONFIG_AU_MUXER)
+=
au.o
rawenc.o
OBJS-$(CONFIG_AVI_DEMUXER)
+=
avidec.o
isom.o
OBJS-$(CONFIG_AVI_DEMUXER)
+=
avidec.o
OBJS-$(CONFIG_AVI_MUXER)
+=
avienc.o
OBJS-$(CONFIG_AVI_MUXER)
+=
avienc.o
OBJS-$(CONFIG_AVISYNTH)
+=
avisynth.o
OBJS-$(CONFIG_AVISYNTH)
+=
avisynth.o
OBJS-$(CONFIG_AVM2_MUXER)
+=
swfenc.o
swf.o
OBJS-$(CONFIG_AVM2_MUXER)
+=
swfenc.o
swf.o
...
@@ -89,13 +91,13 @@ OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
...
@@ -89,13 +91,13 @@ OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
OBJS-$(CONFIG_BMV_DEMUXER)
+=
bmv.o
OBJS-$(CONFIG_BMV_DEMUXER)
+=
bmv.o
OBJS-$(CONFIG_C93_DEMUXER)
+=
c93.o
vocdec.o
voc.o
OBJS-$(CONFIG_C93_DEMUXER)
+=
c93.o
vocdec.o
voc.o
OBJS-$(CONFIG_CAF_DEMUXER)
+=
cafdec.o
caf.o
mov.o
mov_chan.o
\
OBJS-$(CONFIG_CAF_DEMUXER)
+=
cafdec.o
caf.o
mov.o
mov_chan.o
\
isom.o
replaygain.o
replaygain.o
OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)
+=
cavsvideodec.o
rawdec.o
OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)
+=
cavsvideodec.o
rawdec.o
OBJS-$(CONFIG_CAVSVIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_CAVSVIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER)
+=
cdg.o
OBJS-$(CONFIG_CDG_DEMUXER)
+=
cdg.o
OBJS-$(CONFIG_CDXL_DEMUXER)
+=
cdxl.o
OBJS-$(CONFIG_CDXL_DEMUXER)
+=
cdxl.o
OBJS-$(CONFIG_CRC_MUXER)
+=
crcenc.o
OBJS-$(CONFIG_CRC_MUXER)
+=
crcenc.o
OBJS-$(CONFIG_DASH_MUXER)
+=
dashenc.o
isom.o
OBJS-$(CONFIG_DASH_MUXER)
+=
dashenc.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
dauddec.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
dauddec.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daudenc.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daudenc.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
...
@@ -173,11 +175,11 @@ OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
...
@@ -173,11 +175,11 @@ OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER)
+=
m4vdec.o
rawdec.o
OBJS-$(CONFIG_M4V_DEMUXER)
+=
m4vdec.o
rawdec.o
OBJS-$(CONFIG_M4V_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_M4V_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_MATROSKA_DEMUXER)
+=
matroskadec.o
matroska.o
\
OBJS-$(CONFIG_MATROSKA_DEMUXER)
+=
matroskadec.o
matroska.o
\
isom.o
rmsipr.o
\
rmsipr.o
\
oggparsevorbis.o
vorbiscomment.o
\
oggparsevorbis.o
vorbiscomment.o
\
flac_picture.o
replaygain.o
flac_picture.o
replaygain.o
OBJS-$(CONFIG_MATROSKA_MUXER)
+=
matroskaenc.o
matroska.o
\
OBJS-$(CONFIG_MATROSKA_MUXER)
+=
matroskaenc.o
matroska.o
\
isom.o
avc.o
hevc.o
\
avc.o
hevc.o
\
flacenc_header.o
avlanguage.o
vorbiscomment.o
wv.o
flacenc_header.o
avlanguage.o
vorbiscomment.o
wv.o
OBJS-$(CONFIG_MD5_MUXER)
+=
md5enc.o
OBJS-$(CONFIG_MD5_MUXER)
+=
md5enc.o
OBJS-$(CONFIG_MJPEG_DEMUXER)
+=
rawdec.o
OBJS-$(CONFIG_MJPEG_DEMUXER)
+=
rawdec.o
...
@@ -187,8 +189,8 @@ OBJS-$(CONFIG_MLP_MUXER) += rawenc.o
...
@@ -187,8 +189,8 @@ OBJS-$(CONFIG_MLP_MUXER) += rawenc.o
OBJS-$(CONFIG_MM_DEMUXER)
+=
mm.o
OBJS-$(CONFIG_MM_DEMUXER)
+=
mm.o
OBJS-$(CONFIG_MMF_DEMUXER)
+=
mmf.o
pcm.o
OBJS-$(CONFIG_MMF_DEMUXER)
+=
mmf.o
pcm.o
OBJS-$(CONFIG_MMF_MUXER)
+=
mmf.o
OBJS-$(CONFIG_MMF_MUXER)
+=
mmf.o
OBJS-$(CONFIG_MOV_DEMUXER)
+=
mov.o
isom.o
mov_chan.o
replaygain.o
OBJS-$(CONFIG_MOV_DEMUXER)
+=
mov.o
mov_chan.o
replaygain.o
OBJS-$(CONFIG_MOV_MUXER)
+=
movenc.o
isom.o
avc.o
hevc.o
\
OBJS-$(CONFIG_MOV_MUXER)
+=
movenc.o
avc.o
hevc.o
\
movenchint.o
mov_chan.o
movenchint.o
mov_chan.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MP3_DEMUXER)
+=
mp3dec.o
replaygain.o
OBJS-$(CONFIG_MP3_DEMUXER)
+=
mp3dec.o
replaygain.o
...
@@ -203,7 +205,7 @@ OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o
...
@@ -203,7 +205,7 @@ OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o
OBJS-$(CONFIG_MPEG1VIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_MPEG1VIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_MPEG2VIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_MPEG2VIDEO_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_MPEGPS_DEMUXER)
+=
mpeg.o
OBJS-$(CONFIG_MPEGPS_DEMUXER)
+=
mpeg.o
OBJS-$(CONFIG_MPEGTS_DEMUXER)
+=
mpegts.o
isom.o
OBJS-$(CONFIG_MPEGTS_DEMUXER)
+=
mpegts.o
OBJS-$(CONFIG_MPEGTS_MUXER)
+=
mpegtsenc.o
OBJS-$(CONFIG_MPEGTS_MUXER)
+=
mpegtsenc.o
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)
+=
mpegvideodec.o
rawdec.o
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)
+=
mpegvideodec.o
rawdec.o
OBJS-$(CONFIG_MPJPEG_DEMUXER)
+=
mpjpegdec.o
OBJS-$(CONFIG_MPJPEG_DEMUXER)
+=
mpjpegdec.o
...
@@ -323,7 +325,7 @@ OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
...
@@ -323,7 +325,7 @@ OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
OBJS-$(CONFIG_SMACKER_DEMUXER)
+=
smacker.o
OBJS-$(CONFIG_SMACKER_DEMUXER)
+=
smacker.o
OBJS-$(CONFIG_SMJPEG_DEMUXER)
+=
smjpegdec.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_DEMUXER)
+=
smjpegdec.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_MUXER)
+=
smjpegenc.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_MUXER)
+=
smjpegenc.o
smjpeg.o
OBJS-$(CONFIG_SMOOTHSTREAMING_MUXER)
+=
smoothstreamingenc.o
isom.o
OBJS-$(CONFIG_SMOOTHSTREAMING_MUXER)
+=
smoothstreamingenc.o
OBJS-$(CONFIG_SMUSH_DEMUXER)
+=
smush.o
OBJS-$(CONFIG_SMUSH_DEMUXER)
+=
smush.o
OBJS-$(CONFIG_SOL_DEMUXER)
+=
sol.o
pcm.o
OBJS-$(CONFIG_SOL_DEMUXER)
+=
sol.o
pcm.o
OBJS-$(CONFIG_SOX_DEMUXER)
+=
soxdec.o
pcm.o
OBJS-$(CONFIG_SOX_DEMUXER)
+=
soxdec.o
pcm.o
...
@@ -356,7 +358,7 @@ OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o
...
@@ -356,7 +358,7 @@ OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o
OBJS-$(CONFIG_WAV_MUXER)
+=
wavenc.o
OBJS-$(CONFIG_WAV_MUXER)
+=
wavenc.o
OBJS-$(CONFIG_WC3_DEMUXER)
+=
wc3movie.o
OBJS-$(CONFIG_WC3_DEMUXER)
+=
wc3movie.o
OBJS-$(CONFIG_WEBM_MUXER)
+=
matroskaenc.o
matroska.o
\
OBJS-$(CONFIG_WEBM_MUXER)
+=
matroskaenc.o
matroska.o
\
isom.o
avc.o
hevc.o
\
avc.o
hevc.o
\
flacenc_header.o
avlanguage.o
\
flacenc_header.o
avlanguage.o
\
wv.o
vorbiscomment.o
wv.o
vorbiscomment.o
OBJS-$(CONFIG_WSAUD_DEMUXER)
+=
westwood_aud.o
OBJS-$(CONFIG_WSAUD_DEMUXER)
+=
westwood_aud.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