Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Unified Diff: source/libvpx/vpx_dsp/bitreader.c

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « source/libvpx/vpx_dsp/arm/vpx_convolve_neon.c ('k') | source/libvpx/vpx_dsp/fastssim.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx_dsp/bitreader.c
diff --git a/source/libvpx/vpx_dsp/bitreader.c b/source/libvpx/vpx_dsp/bitreader.c
index 4420fadeedceddebf882da7271c191d6a043abe8..ba87022c03ead19fc831e0766d531e1b09554ea3 100644
--- a/source/libvpx/vpx_dsp/bitreader.c
+++ b/source/libvpx/vpx_dsp/bitreader.c
@@ -48,7 +48,7 @@ void vpx_reader_fill(vpx_reader *r) {
int shift = BD_VALUE_SIZE - CHAR_BIT - (count + CHAR_BIT);
if (r->decrypt_cb) {
- size_t n = MIN(sizeof(r->clear_buffer), bytes_left);
+ size_t n = VPXMIN(sizeof(r->clear_buffer), bytes_left);
r->decrypt_cb(r->decrypt_state, buffer, r->clear_buffer, (int)n);
buffer = r->clear_buffer;
buffer_start = r->clear_buffer;
« no previous file with comments | « source/libvpx/vpx_dsp/arm/vpx_convolve_neon.c ('k') | source/libvpx/vpx_dsp/fastssim.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698