author Jean-Yves Avenard <>
Thu, 14 Apr 2016 23:32:40 +1000
changeset 331240 66e2cb10760096a9b9f1b1de813a7e3865cb5630
parent 330355 3ce37297f52f339351935fdb6166d83a9cd0cd27
child 331692 7bffe558f364bea04f7e3eea847cc05e12d3e0ab
permissions -rw-r--r--
Bug 1264622: [MP4] Resync stagefright's updateAudioTrackInfoFromESDS_MPEG4Audio with upstream. r=kentuckyfriedtakahe This adds support for parsing AOT audio specific config (which contains extended channels layout). MozReview-Commit-ID: 7yNGBEAI7sv

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1186060 - Switch Windows compiler from VS2013 to VS2015