libeplayer3: unbreak ipcm

Origin commit data
------------------
Branch: master
Commit: 5f2f008800
Author: martii <m4rtii@gmx.de>
Date: 2014-04-05 (Sat, 05 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-05 16:34:03 +02:00
parent aa19fb8024
commit 27ea5697c8

View File

@@ -299,10 +299,14 @@ int restart_audio_resampling = 0;
static int resetIpcm() static int resetIpcm()
{ {
if (swr) if (swr) {
swr_free(&swr); swr_free(&swr);
if (decoded_frame) swr = NULL; //FIXME: Needed?
}
if (decoded_frame) {
av_frame_free(&decoded_frame); av_frame_free(&decoded_frame);
decoded_frame = NULL; //FIXME: Needed?
}
return 0; return 0;
} }
@@ -427,15 +431,14 @@ static int writeDataIpcm(WriterAVCallData_t *call)
pcmOut.uBitsPerSample = 16; pcmOut.uBitsPerSample = 16;
pcmOut.bLittleEndian = 1; pcmOut.bLittleEndian = 1;
AVPacket packet; AVPacket pcmPacket;
packet.data = output; pcmPacket.data = output;
packet.size = out_samples * sizeof(short) * out_channels; pcmPacket.size = out_samples * sizeof(short) * out_channels;
pcmOut.packet = &packet; pcmOut.packet = &pcmPacket;
pcmOut.Pts = pts; // FIXME videoTrack ? pts : 0; pcmOut.Pts = pts; // FIXME videoTrack ? pts : 0;
pcmOut.stream = call->stream; //pcmOut.stream = call->stream;
pcmOut.avfc = call->avfc; //pcmOut.avfc = call->avfc;
pcmOut.packet = NULL;
writeData(&pcmOut); writeData(&pcmOut);