Merge pull request #5816 from raven02/patch-8

No need to init packet as 0
This commit is contained in:
Henrik Rydgård 2014-04-09 15:01:00 +02:00
commit f328cfe655
3 changed files with 3 additions and 4 deletions

View file

@ -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) {

View file

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

View file

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