chromium/scripts/build_ffmpeg.sh - Issue 9325049: Fixup chromium specific bits after merge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromium/scripts/build_ffmpeg.sh

Issue 9325049: Fixup chromium specific bits after merge. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master

Patch Set: Code review fixes. Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chromium/scripts/build_ffmpeg.sh

diff --git a/chromium/scripts/build_ffmpeg.sh b/chromium/scripts/build_ffmpeg.sh

index 3f67d4e5c17f5733e5525de235144f384b762e6f..b6a26f5ef0a0e7a25602644da8b7b08347338684 100755

--- a/chromium/scripts/build_ffmpeg.sh

+++ b/chromium/scripts/build_ffmpeg.sh

@@ -54,9 +54,10 @@ if [ ! -f "$FFMPEG_PATH/chromium/scripts/$(basename $0)" ]; then

exit 1

-# 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

@@ -391,4 +392,5 @@ if [ "$TARGET_OS" = "linux" ]; then

build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS

-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."

« no previous file with comments | « chromium/ffmpeg_stub_headers.fragment ('k') | chromium/scripts/copy_config.sh » ('j') | no next file with comments »