openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-12-01 15:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'

Browse Source 
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 19:21:29 +02:00
commit 05f1b4e2ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2075,8 +2075,8 @@ tak_demuxer_select="tak_parser"
tg2_muxer_select="mov_muxer" tg2_muxer_select="mov_muxer"
tgp_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer"
vobsub_demuxer_select="mpegps_demuxer" vobsub_demuxer_select="mpegps_demuxer"
w64_demuxer_deps="wav_demuxer" w64_demuxer_select="wav_demuxer"
w64_muxer_deps="wav_muxer" w64_muxer_select="wav_muxer"
wav_demuxer_select="riffdec" wav_demuxer_select="riffdec"
wav_muxer_select="riffenc" wav_muxer_select="riffenc"
webm_muxer_select="riffenc" webm_muxer_select="riffenc"