generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'

Browse Source 
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
  vp3dsp: don't do aligned reads on input.
  mlp_parser: cosmetics: re-indent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-23 16:52:05 +01:00
commit 516f30ed20
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vp3dsp.c
View File

@ -282,11 +282,11 @@ static void put_no_rnd_pixels_l2(uint8_t *dst, const uint8_t *src1,
for (i = 0; i < h; i++) {
uint32_t a, b;
a = AV_RN32A(&src1[i * stride]);
b = AV_RN32A(&src2[i * stride]);
a = AV_RN32(&src1[i * stride]);
b = AV_RN32(&src2[i * stride]);
AV_WN32A(&dst[i * stride], no_rnd_avg32(a, b));
a = AV_RN32A(&src1[i * stride + 4]);
b = AV_RN32A(&src2[i * stride + 4]);
a = AV_RN32(&src1[i * stride + 4]);
b = AV_RN32(&src2[i * stride + 4]);
AV_WN32A(&dst[i * stride + 4], no_rnd_avg32(a, b));
}
}