~chromium-team/chromium-browser/chromium-browser.maverick

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Micah Gersten
  • Date: 2011-10-12 07:32:12 UTC
  • Revision ID: micahg@ubuntu.com-20111012073212-evqu67b1dqu4kbct
* Merge r634 and r635 from chromium-browser.lucid

Show diffs side-by-side

added added

removed removed

Lines of Context:
193
193
        build_ffmpegsumo=0 \
194
194
        $(NULL)
195
195
FFMPEG_MT_GYP_DEFINES = \
196
 
        use_system_vpx=1 \
 
196
        use_system_vpx=0 \
197
197
        release_extra_cflags=-g \
198
198
        $(NULL)
199
199
FFMPEG_MT_STD_GYP_DEFINES   = $(NULL)