oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: simplify ffmpeg_send_packet()

Browse Source
This commit is contained in:
Max Kellermann 2014-12-18 23:21:48 +01:00
parent 0f2a304d34
commit 49f6b50ed3
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -335,24 +335,24 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
break; break;
} }
uint8_t *output_buffer = nullptr;
int audio_size = 0;
if (got_frame) {
audio_size = copy_interleave_frame(codec_context,
frame,
&output_buffer,
buffer);
if (audio_size < 0) {
/* this must be a serious error,
e.g. OOM */
LogFfmpegError(audio_size);
return DecoderCommand::STOP;
}
}
packet2.data += len; packet2.data += len;
packet2.size -= len; packet2.size -= len;
if (!got_frame)
continue;
uint8_t *output_buffer = nullptr;
int audio_size =
copy_interleave_frame(codec_context, frame,
&output_buffer,
buffer);
if (audio_size < 0) {
/* this must be a serious error,
e.g. OOM */
LogFfmpegError(audio_size);
return DecoderCommand::STOP;
}
if (audio_size <= 0) if (audio_size <= 0)
continue; continue;