* [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable
@ 2023-12-30 8:40 xufuji456 via ffmpeg-devel
2023-12-30 15:21 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: xufuji456 via ffmpeg-devel @ 2023-12-30 8:40 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: xufuji456
There is a warning in XCode:"Declaration shadows a local variable"
Signed-off-by: xufuji456 <839789740@qq.com>
---
fftools/ffplay.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index ea5ff31393..17861e60be 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -1930,11 +1930,11 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
if (sd)
displaymatrix = (int32_t *)sd->data;
if (!displaymatrix) {
- const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
- is->video_st->codecpar->nb_coded_side_data,
- AV_PKT_DATA_DISPLAYMATRIX);
- if (sd)
- displaymatrix = (int32_t *)sd->data;
+ const AVPacketSideData *psd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
+ is->video_st->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_DISPLAYMATRIX);
+ if (psd)
+ displaymatrix = (int32_t *)psd->data;
}
theta = get_rotation(displaymatrix);
--
2.39.3 (Apple Git-145)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable
2023-12-30 8:40 [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable xufuji456 via ffmpeg-devel
@ 2023-12-30 15:21 ` Zhao Zhili
2024-01-04 13:24 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: Zhao Zhili @ 2023-12-30 15:21 UTC (permalink / raw)
To: 'FFmpeg development discussions and patches'; +Cc: 'xufuji456'
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of xufuji456 via ffmpeg-devel
> Sent: 2023年12月30日 16:41
> To: ffmpeg-devel@ffmpeg.org
> Cc: xufuji456 <839789740@qq.com>
> Subject: [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable
>
> There is a warning in XCode:"Declaration shadows a local variable"
>
> Signed-off-by: xufuji456 <839789740@qq.com>
> ---
> fftools/ffplay.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fftools/ffplay.c b/fftools/ffplay.c
> index ea5ff31393..17861e60be 100644
> --- a/fftools/ffplay.c
> +++ b/fftools/ffplay.c
> @@ -1930,11 +1930,11 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
> if (sd)
> displaymatrix = (int32_t *)sd->data;
> if (!displaymatrix) {
> - const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
> - is->video_st->codecpar->nb_coded_side_data,
> - AV_PKT_DATA_DISPLAYMATRIX);
> - if (sd)
> - displaymatrix = (int32_t *)sd->data;
> + const AVPacketSideData *psd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
> + is->video_st->codecpar->nb_coded_side_data,
> + AV_PKT_DATA_DISPLAYMATRIX);
> + if (psd)
> + displaymatrix = (int32_t *)psd->data;
> }
> theta = get_rotation(displaymatrix);
LGTM. The commit message could be reworded like "fix a variable shadowing".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable
2023-12-30 15:21 ` Zhao Zhili
@ 2024-01-04 13:24 ` Zhao Zhili
0 siblings, 0 replies; 3+ messages in thread
From: Zhao Zhili @ 2024-01-04 13:24 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: xufuji456
> On Dec 30, 2023, at 23:21, Zhao Zhili <quinkblack@foxmail.com> wrote:
>
>> -----Original Message-----
>> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of xufuji456 via ffmpeg-devel
>> Sent: 2023年12月30日 16:41
>> To: ffmpeg-devel@ffmpeg.org
>> Cc: xufuji456 <839789740@qq.com>
>> Subject: [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable
>>
>> There is a warning in XCode:"Declaration shadows a local variable"
>>
>> Signed-off-by: xufuji456 <839789740@qq.com>
>> ---
>> fftools/ffplay.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>>
>
> LGTM. The commit message could be reworded like "fix a variable shadowing".
Applied, thanks!
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org <mailto:ffmpeg-devel@ffmpeg.org>
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org <mailto:ffmpeg-devel-request@ffmpeg.org> with subject "unsubscribe".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-04 13:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-30 8:40 [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable xufuji456 via ffmpeg-devel
2023-12-30 15:21 ` Zhao Zhili
2024-01-04 13:24 ` Zhao Zhili
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