diff options
| author | fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-08 20:34:36 +0000 |
|---|---|---|
| committer | fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-05-08 20:34:36 +0000 |
| commit | 5be267a803bbe61e0f4f1d5d878e02d3623182bc (patch) | |
| tree | 70c41ffc980f57fb9cdd2a25a02d2462dc95e69f /source | |
| parent | 810cf1767dc8df4783e02ba8a712072f50ddc99e (diff) | |
| download | libvpx-5be267a803bbe61e0f4f1d5d878e02d3623182bc.tar.gz | |
libvpx: Pull from upstream
Current HEAD: 91344f0a36f83d73af1f5325be792235eb021802
git log from upstream:
e1f2113 Use __asm__ __volatile__ with gcc
e39b9a6 webmdec: Fix visual studio warnings.
BUG=370959
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/272723009
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@269083 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'source')
| -rw-r--r-- | source/libvpx/vp8/encoder/x86/quantize_ssse3.c | 4 | ||||
| -rw-r--r-- | source/libvpx/webmdec.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/libvpx/vp8/encoder/x86/quantize_ssse3.c b/source/libvpx/vp8/encoder/x86/quantize_ssse3.c index 9b4471d..448217f 100644 --- a/source/libvpx/vp8/encoder/x86/quantize_ssse3.c +++ b/source/libvpx/vp8/encoder/x86/quantize_ssse3.c @@ -27,7 +27,11 @@ static int bsr(int mask) { #else static int bsr(int mask) { int eob; +#if defined(__GNUC__) && __GNUC__ + __asm__ __volatile__("bsr %1, %0" : "=r" (eob) : "r" (mask) : "flags"); +#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) asm volatile("bsr %1, %0" : "=r" (eob) : "r" (mask) : "flags"); +#endif eob++; if (mask == 0) eob = 0; diff --git a/source/libvpx/webmdec.cc b/source/libvpx/webmdec.cc index eb89bef..4383e8e 100644 --- a/source/libvpx/webmdec.cc +++ b/source/libvpx/webmdec.cc @@ -108,8 +108,8 @@ int file_is_webm(struct WebmInputContext *webm_ctx, vpx_ctx->framerate.denominator = 0; vpx_ctx->framerate.numerator = 0; - vpx_ctx->width = video_track->GetWidth(); - vpx_ctx->height = video_track->GetHeight(); + vpx_ctx->width = static_cast<uint32_t>(video_track->GetWidth()); + vpx_ctx->height = static_cast<uint32_t>(video_track->GetHeight()); get_first_cluster(webm_ctx); |