From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 7/7] avutil/integer: Use '|' instead of '+' where it is more natural
Date: Fri, 21 Oct 2022 20:59:39 +0200
Message-ID: <AS8P250MB0744CDA3AB6D01572B08613A8F2D9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744FE41BC5B8476814DEFFD8F2D9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavutil/integer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/integer.c b/libavutil/integer.c
index a692c3783c..d0a0f62c9a 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 = 0;
for (int i = 3; i >= 0; i--)
- out = (out<<16) + a.v[i];
+ out = (out << 16) | a.v[i];
return out;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-10-21 19:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 18:56 [FFmpeg-devel] [PATCH 1/7] avcodec/snow_dwt: Fix left shifts of negative numbers Andreas Rheinhardt
2022-10-21 18:59 ` [FFmpeg-devel] [PATCH 2/7] avcodec/motion_est_template: Avoid using last + 1 element of array Andreas Rheinhardt
2022-10-21 18:59 ` [FFmpeg-devel] [PATCH 3/7] avcodec/snowenc: Fix invalid left shift of negative numbers Andreas Rheinhardt
2022-10-22 8:58 ` Michael Niedermayer
2022-10-21 18:59 ` [FFmpeg-devel] [PATCH 4/7] avutil/aes: Don't use misaligned pointers Andreas Rheinhardt
2022-10-21 18:59 ` [FFmpeg-devel] [PATCH 5/7] avutil/aes: Don't use out-of-bounds index Andreas Rheinhardt
2022-10-21 18:59 ` [FFmpeg-devel] [PATCH 6/7] avutil/integer: Fix undefined left shifts of negative numbers Andreas Rheinhardt
2022-10-21 18:59 ` Andreas Rheinhardt [this message]
2022-10-24 15:15 ` [FFmpeg-devel] [PATCH 1/7] avcodec/snow_dwt: Fix " Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744CDA3AB6D01572B08613A8F2D9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git