From 619039aed665be68a7ab87adb3570bed2549bf13 Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 7 Apr 2014 11:39:28 +0800 Subject: [PATCH] No need to init packet as {0} --- Core/HLE/sceAtrac.cpp | 4 ++-- Core/HLE/sceMp3.cpp | 1 - Core/HW/MediaEngine.cpp | 2 +- Core/HW/SimpleAudioDec.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index f4c532e414..a62ffb8359 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -598,7 +598,7 @@ u32 _AtracDecodeData(int atracID, u8* outbuf, u32 *SamplesNum, u32* finish, int int forceseekSample = atrac->currentSample * 2 > atrac->endSample ? 0 : atrac->endSample; atrac->SeekToSample(forceseekSample); atrac->SeekToSample(atrac->currentSample); - AVPacket packet = {0}; + AVPacket packet; av_init_packet(&packet); int got_frame, avret; while (av_read_frame(atrac->pFormatCtx, &packet) >= 0) { @@ -1771,7 +1771,7 @@ int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesConsumedA atrac->SeekToSample(atrac->currentSample); if (!atrac->failedDecode) { - AVPacket packet = {0}; + AVPacket packet; av_init_packet(&packet); int got_frame, avret; while (av_read_frame(atrac->pFormatCtx, &packet) >= 0) { diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index beac952a6c..ff3dd4cdb7 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -171,7 +171,6 @@ int sceMp3Decode(u32 mp3, u32 outPcmPtr) { AVFrame frame; memset(&frame, 0, sizeof(frame)); AVPacket packet; - memset(&packet, 0, sizeof(packet)); av_init_packet(&packet); int got_frame = 0, ret; static int audio_frame_count = 0; diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index 133a2d5982..93b9452ff6 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -473,7 +473,7 @@ bool MediaEngine::stepVideo(int videoPixelMode) { // Update the linesize for the new format too. We started with the largest size, so it should fit. m_pFrameRGB->linesize[0] = getPixelFormatBytes(videoPixelMode) * m_desWidth; - AVPacket packet = {0}; + AVPacket packet; av_init_packet(&packet); int frameFinished; bool bGetFrame = false; diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 73f98f05d6..1e332dc453 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -156,7 +156,7 @@ SimpleAudio::~SimpleAudio() { // Input is a single Audio packet. bool SimpleAudio::Decode(void* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG - AVPacket packet = { 0 }; + AVPacket packet; av_init_packet(&packet); packet.data = static_cast(inbuf); packet.size = inbytes;