diff options
| author |  Lioncash | 2020-10-27 02:20:17 -0400 |
|---|---|---|
| committer | Lioncash | 2020-10-27 02:20:17 -0400 |
| commit | dcc26c54a52eb6fe2fc5fcb7a4b34bc1a4ad4789 (patch) | |
| tree | a12a937c5f0702422f652f698e3ad41ae9033ca4 /src | |
| parent | nvdec: Tidy up header includes (diff) | |
| download | yuzu-dcc26c54a52eb6fe2fc5fcb7a4b34bc1a4ad4789.tar.gz yuzu-dcc26c54a52eb6fe2fc5fcb7a4b34bc1a4ad4789.tar.xz yuzu-dcc26c54a52eb6fe2fc5fcb7a4b34bc1a4ad4789.zip | |
vp9: Resolve variable shadowing
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_classes/codecs/vp9.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp index d888e773a..04e015ae8 100644 --- a/src/video_core/command_classes/codecs/vp9.cpp +++ b/src/video_core/command_classes/codecs/vp9.cpp | |||
| @@ -415,7 +415,7 @@ Vp9FrameContainer VP9::GetCurrentFrame(const NvdecCommon::NvdecRegisters& state) | |||
| 415 | frame.info.bitstream_size); | 415 | frame.info.bitstream_size); |
| 416 | } | 416 | } |
| 417 | // Buffer two frames, saving the last show frame info | 417 | // Buffer two frames, saving the last show frame info |
| 418 | if (next_next_frame.bit_stream.size() != 0) { | 418 | if (!next_next_frame.bit_stream.empty()) { |
| 419 | Vp9FrameContainer temp{ | 419 | Vp9FrameContainer temp{ |
| 420 | .info = frame.info, | 420 | .info = frame.info, |
| 421 | .bit_stream = frame.bit_stream, | 421 | .bit_stream = frame.bit_stream, |
| @@ -425,15 +425,15 @@ Vp9FrameContainer VP9::GetCurrentFrame(const NvdecCommon::NvdecRegisters& state) | |||
| 425 | frame.bit_stream = next_next_frame.bit_stream; | 425 | frame.bit_stream = next_next_frame.bit_stream; |
| 426 | next_next_frame = std::move(temp); | 426 | next_next_frame = std::move(temp); |
| 427 | 427 | ||
| 428 | if (next_frame.bit_stream.size() != 0) { | 428 | if (!next_frame.bit_stream.empty()) { |
| 429 | Vp9FrameContainer temp{ | 429 | Vp9FrameContainer temp2{ |
| 430 | .info = frame.info, | 430 | .info = frame.info, |
| 431 | .bit_stream = frame.bit_stream, | 431 | .bit_stream = frame.bit_stream, |
| 432 | }; | 432 | }; |
| 433 | next_frame.info.show_frame = frame.info.last_frame_shown; | 433 | next_frame.info.show_frame = frame.info.last_frame_shown; |
| 434 | frame.info = next_frame.info; | 434 | frame.info = next_frame.info; |
| 435 | frame.bit_stream = next_frame.bit_stream; | 435 | frame.bit_stream = next_frame.bit_stream; |
| 436 | next_frame = std::move(temp); | 436 | next_frame = std::move(temp2); |
| 437 | } else { | 437 | } else { |
| 438 | next_frame.info = frame.info; | 438 | next_frame.info = frame.info; |
| 439 | next_frame.bit_stream = frame.bit_stream; | 439 | next_frame.bit_stream = frame.bit_stream; |