diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/flac | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/flac')
| -rw-r--r-- | chromium/third_party/flac/README.chromium | 4 | ||||
| -rw-r--r-- | chromium/third_party/flac/src/libFLAC/stream_decoder.c | 2 | ||||
| -rw-r--r-- | chromium/third_party/flac/src/libFLAC/stream_encoder.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chromium/third_party/flac/README.chromium b/chromium/third_party/flac/README.chromium index 7e9c0e3ff9b..64cf1ef7302 100644 --- a/chromium/third_party/flac/README.chromium +++ b/chromium/third_party/flac/README.chromium @@ -15,6 +15,6 @@ of flac-1.2.1 with all the unused files removed and the following changes: - Replaced include/share/alloc.h with a new file - Added flac.gyp, flac.h, README.chromium and src/libFLAC/alloc.c - Fixed memset(ctx, 0, sizeof(ctx)); in src/libFLAC/md5.c:266 -- Add #define for fseeko/ftello for VS2012 in src/libFLAC/stream_decoder.c and - src/libFLAC/stream_encoder.c +- Add #define for fseeko/ftello for VS2012 and above in + src/libFLAC/stream_decoder.c and src/libFLAC/stream_encoder.c - Fixed Win64 compilation issues: https://codereview.chromium.org/11567032/ diff --git a/chromium/third_party/flac/src/libFLAC/stream_decoder.c b/chromium/third_party/flac/src/libFLAC/stream_decoder.c index c38e883afd2..176264867cc 100644 --- a/chromium/third_party/flac/src/libFLAC/stream_decoder.c +++ b/chromium/third_party/flac/src/libFLAC/stream_decoder.c @@ -50,7 +50,7 @@ #if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */ #define fseeko fseek #define ftello ftell -#elif _MSC_VER <= 1700 +#else #define fseeko _fseeki64 #define ftello _ftelli64 #endif diff --git a/chromium/third_party/flac/src/libFLAC/stream_encoder.c b/chromium/third_party/flac/src/libFLAC/stream_encoder.c index 8a74d1d8c8e..fc0d22d971f 100644 --- a/chromium/third_party/flac/src/libFLAC/stream_encoder.c +++ b/chromium/third_party/flac/src/libFLAC/stream_encoder.c @@ -50,7 +50,7 @@ #if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */ #define fseeko fseek #define ftello ftell -#elif _MSC_VER <= 1700 +#else #define fseeko _fseeki64 #define ftello _ftelli64 #endif |