Fixup chromium specific bits after merge.

chromium/scripts/build_ffmpeg.sh

 #!/bin/bash -e
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Builds Chromium, Google Chrome and *OS FFmpeg binaries.
 #
 # For Windows it assumes being run from a MinGW shell with Visual Studio
 # environment (i.e., lib.exe and editbin.exe are in $PATH).
@@ skipping 36 matching lines @@
   echo "Valid target OSes are: linux, mac, win"
   exit 1
 fi
 
 # Check FFMPEG_PATH to contain this script.
 if [ ! -f "$FFMPEG_PATH/chromium/scripts/$(basename $0)" ]; then
   echo "$FFMPEG_PATH doesn't appear to contain FFmpeg"
   exit 1
 fi
 
-# If configure & make works but this script doesn't, make sure to grep for these.
-LIBAVCODEC_VERSION_MAJOR=53
-LIBAVFORMAT_VERSION_MAJOR=53
+# If configure & make works but this script doesn't, make sure to grep for
+# these.
+LIBAVCODEC_VERSION_MAJOR=54
+LIBAVFORMAT_VERSION_MAJOR=54
 LIBAVUTIL_VERSION_MAJOR=51
 
 case $(uname -sm) in
   Linux\ i386)
     HOST_OS=linux
     HOST_ARCH=ia32
     JOBS=$(grep processor /proc/cpuinfo | wc -l)
     ;;
   Linux\ x86_64)
     HOST_OS=linux
@@ skipping 314 matching lines @@
 echo "Chrome configure/build:"
 build Chrome $FLAGS_COMMON $FLAGS_CHROME
 
 if [ "$TARGET_OS" = "linux" ]; then
   echo "ChromiumOS configure/build:"
   build ChromiumOS $FLAGS_COMMON $FLAGS_CHROMIUM $FLAGS_CHROMIUMOS
   echo "ChromeOS configure/build:"
   build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS
 fi
 
-echo "Done. If desired you may copy config.h/config.asm into the source/config tree using copy_config.sh."
+echo "Done. If desired you may copy config.h/config.asm into the" \
+     "source/config tree using copy_config.sh."