ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Fri Oct 21 20:25:55 2022 +0200| [d7c3e52fbfca2656b361682dca38ae577a10e8b7] | committer: Andreas Rheinhardt
avutil/integer: Use '|' instead of '+' where it is more natural Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7c3e52fbfca2656b361682dca38ae577a10e8b7 --- libavutil/integer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/integer.c b/libavutil/integer.c index 3bc33dbca2..ae87c467b2 100644 --- a/libavutil/integer.c +++ b/libavutil/integer.c @@ -104,7 +104,7 @@ AVInteger av_shr_i(AVInteger a, int s){ unsigned int index= i + (s>>4); unsigned int v=0; if (index + 1 < AV_INTEGER_SIZE) v = a.v[index + 1] * (1U << 16); - if(index <AV_INTEGER_SIZE) v+= a.v[index ]; + if (index < AV_INTEGER_SIZE) v |= a.v[index]; out.v[i]= v >> (s&15); } return out; @@ -161,6 +161,6 @@ int64_t av_i2int(AVInteger a){ uint64_t out = a.v[3]; for (int i = 2; i >= 0; i--) - out = (out<<16) + a.v[i]; + out = (out << 16) | a.v[i]; return out; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
