From 407acb863a4989f3dba804f7ffe664ae80c8ef11 Mon Sep 17 00:00:00 2001 From: jcdr428 Date: Tue, 3 May 2022 18:36:17 +0000 Subject: [PATCH] Fix declaration of variables already declared in outer scope --- tsMuxer/main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tsMuxer/main.cpp b/tsMuxer/main.cpp index 2ce3d4f..a264795 100644 --- a/tsMuxer/main.cpp +++ b/tsMuxer/main.cpp @@ -136,10 +136,10 @@ void detectStreamReader(const char* fileName, MPLSParser* mplsParser, bool isSub { if (mplsParser) { - MPLSStreamInfo streamInfo = mplsParser->getStreamByPID(streams[i].trackID); - if (streamInfo.streamPID) + MPLSStreamInfo mplsStreamInfo = mplsParser->getStreamByPID(streams[i].trackID); + if (mplsStreamInfo.streamPID) { - if (streamInfo.isSecondary) + if (mplsStreamInfo.isSecondary) streams[i].isSecondary = true; } else @@ -163,27 +163,27 @@ void detectStreamReader(const char* fileName, MPLSParser* mplsParser, bool isSub if (streams[i].codecInfo.codecID == CODEC_S_PGS && mplsParser && mplsParser->isDependStreamExist) { // PG stream - MPLSStreamInfo streamInfo = mplsParser->getStreamByPID(streams[i].trackID); - int pgTrackNum = streamInfo.streamPID - 0x1200; + MPLSStreamInfo mplsStreamInfo = mplsParser->getStreamByPID(streams[i].trackID); + int pgTrackNum = mplsStreamInfo.streamPID - 0x1200; if (pgTrackNum >= 0) { - if (streamInfo.offsetId != 0xff) + if (mplsStreamInfo.offsetId != 0xff) { descr += " 3d-plane: "; - descr += int32ToStr(streamInfo.offsetId); + descr += int32ToStr(mplsStreamInfo.offsetId); } else { descr += " 3d-plane: undefined"; } - if (streamInfo.isSSPG) + if (mplsStreamInfo.isSSPG) { descr += " (stereo, right="; - descr += (streamInfo.rightEye->type == 2 ? "dep-view " : ""); - descr += int32ToStr(streamInfo.rightEye->streamPID); + descr += (mplsStreamInfo.rightEye->type == 2 ? "dep-view " : ""); + descr += int32ToStr(mplsStreamInfo.rightEye->streamPID); descr += ", left="; - descr += (streamInfo.leftEye->type == 2 ? "dep-view " : ""); - descr += int32ToStr(streamInfo.leftEye->streamPID); + descr += (mplsStreamInfo.leftEye->type == 2 ? "dep-view " : ""); + descr += int32ToStr(mplsStreamInfo.leftEye->streamPID); descr += ")"; } }