[FFmpeg-cvslog] fftool/ffplay: avoid same name in local variable

xufuji456 git at videolan.org
Thu Jan 4 13:57:41 EET 2024


ffmpeg | branch: master | xufuji456 <839789740 at qq.com> | Sat Dec 30 16:40:43 2023 +0800| [6caf34dbe0f0e406c49394c6c6552cc1345957b7] | committer: Zhao Zhili

fftool/ffplay: avoid same name in local variable

There is a warning in XCode:"Declaration shadows a local variable"

Signed-off-by: xufuji456 <839789740 at qq.com>
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6caf34dbe0f0e406c49394c6c6552cc1345957b7
---

 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);
 



More information about the ffmpeg-cvslog mailing list