Bug 772570: untangle MOZ_WEBM from MOZ_VP8 so we can disable webm with webrtc enabled r=def r=ted

This commit is contained in:
Randell Jesup 2012-07-27 13:13:43 -04:00
parent 358145be0c
commit 405ee213a9
3 changed files with 7 additions and 0 deletions

View File

@ -23,6 +23,8 @@ nestegg_track_seek
nestegg_track_type
nestegg_track_video_params
nestegg_tstamp_scale
#endif
#ifdef MOZ_VP8
#ifndef MOZ_NATIVE_LIBVPX
vpx_codec_control_
vpx_codec_dec_init_ver

View File

@ -1584,6 +1584,8 @@ if [ "$MOZ_WEBM" ]; then
media/libnestegg/include/Makefile
media/libnestegg/src/Makefile
"
fi
if [ "$MOZ_VP8" ]; then
if [ ! "$MOZ_NATIVE_LIBVPX" ]; then
add_makefiles "
media/libvpx/Makefile

View File

@ -104,6 +104,9 @@ endif
ifdef MOZ_WEBM
tier_platform_dirs += media/libnestegg
endif
ifdef MOZ_VP8
ifndef MOZ_NATIVE_LIBVPX
tier_platform_dirs += media/libvpx
endif