Commit 7c8038e2 authored by Max Kellermann's avatar Max Kellermann

decoder/ffpmeg: simplify ffmpeg_send_packet()

parent 67333629
...@@ -332,7 +332,14 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is, ...@@ -332,7 +332,14 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
int len = avcodec_decode_audio4(codec_context, int len = avcodec_decode_audio4(codec_context,
frame, &got_frame, frame, &got_frame,
&packet2); &packet2);
if (len >= 0 && got_frame) { if (len < 0) {
/* if error, we skip the frame */
LogDefault(ffmpeg_domain,
"decoding failed, frame skipped");
break;
}
if (got_frame) {
audio_size = copy_interleave_frame(codec_context, audio_size = copy_interleave_frame(codec_context,
frame, frame,
&output_buffer, &output_buffer,
...@@ -341,13 +348,6 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is, ...@@ -341,13 +348,6 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
len = audio_size; len = audio_size;
} }
if (len < 0) {
/* if error, we skip the frame */
LogDefault(ffmpeg_domain,
"decoding failed, frame skipped");
break;
}
packet2.data += len; packet2.data += len;
packet2.size -= len; packet2.size -= len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment