Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-25 14:11:28 +01:00
Code Issues Releases Wiki Activity

dont try to mux a packet if the encoder didnt output one

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Benjamin Drung <bdrung@debian.org>
This commit is contained in:
benjamin.drung@gmail.com
2014-05-23 20:40:34 +00:00
parent b603ed2b7f
commit 5ce748d0b1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/export/ExportFFmpeg.cpp
View File

@@ -517,7 +517,7 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
static int encode_audio(AVCodecContext *avctx, AVPacket *pkt, int nFifoBytes, int16_t *audio_samples) static int encode_audio(AVCodecContext *avctx, AVPacket *pkt, int nFifoBytes, int16_t *audio_samples)
{ {
int i, ch, buffer_size, ret, got_output, nEncodedBytes; int i, ch, buffer_size, ret, got_output = 0, nEncodedBytes;
void *samples = NULL; void *samples = NULL;
AVFrame *frame = NULL; AVFrame *frame = NULL;
@@ -578,12 +578,11 @@ static int encode_audio(AVCodecContext *avctx, AVPacket *pkt, int nFifoBytes, in
return ret; return ret;
} }
nEncodedBytes = pkt->size;
av_frame_free(&frame); av_frame_free(&frame);
av_freep(&samples); av_freep(&samples);
return nEncodedBytes; return got_output;
} }
@@ -743,6 +742,8 @@ bool ExportFFmpeg::EncodeAudioFrame(int16_t *pFrame, int frameSize)
wxLogError(wxT("FFmpeg : ERROR - Can't encode audio frame.")); wxLogError(wxT("FFmpeg : ERROR - Can't encode audio frame."));
return false; return false;
} }
if (ret == 0)
continue;
// Rescale from the codec time_base to the AVStream time_base. // Rescale from the codec time_base to the AVStream time_base.
if (pkt.pts != int64_t(AV_NOPTS_VALUE)) if (pkt.pts != int64_t(AV_NOPTS_VALUE))