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

Unified Diff: source/patched-ffmpeg-mt/libavcodec/vp56.h

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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/patched-ffmpeg-mt/libavcodec/vp3.c ('k') | source/patched-ffmpeg-mt/libavcodec/vp56dsp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavcodec/vp56.h
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/vp56.h (revision 59334)
+++ source/patched-ffmpeg-mt/libavcodec/vp56.h (working copy)
@@ -194,8 +194,8 @@
code_word <<= shift;
bits += shift;
if(bits >= 0 && c->buffer < c->end) {
- code_word |= *c->buffer++ << bits;
- bits -= 8;
+ code_word |= bytestream_get_be16(&c->buffer) << bits;
+ bits -= 16;
}
c->bits = bits;
return code_word;
@@ -211,7 +211,7 @@
{
unsigned int code_word = vp56_rac_renorm(c);
unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
- unsigned int low_shift = low << 8;
+ unsigned int low_shift = low << 16;
int bit = code_word >= low_shift;
c->high = bit ? c->high - low : low;
@@ -226,7 +226,7 @@
{
unsigned long code_word = vp56_rac_renorm(c);
unsigned low = 1 + (((c->high - 1) * prob) >> 8);
- unsigned low_shift = low << 8;
+ unsigned low_shift = low << 16;
if (code_word >= low_shift) {
c->high -= low;
@@ -244,7 +244,7 @@
unsigned int code_word = vp56_rac_renorm(c);
/* equiprobable */
int low = (c->high + 1) >> 1;
- unsigned int low_shift = low << 8;
+ unsigned int low_shift = low << 16;
int bit = code_word >= low_shift;
if (bit) {
c->high -= low;
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/vp3.c ('k') | source/patched-ffmpeg-mt/libavcodec/vp56dsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698