mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
parent
33698ef891
commit
6caf34dbe0
@ -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,
|
||||
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 (sd)
|
||||
displaymatrix = (int32_t *)sd->data;
|
||||
if (psd)
|
||||
displaymatrix = (int32_t *)psd->data;
|
||||
}
|
||||
theta = get_rotation(displaymatrix);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user