From: Clément Bœsch Date: Sun, 19 Mar 2017 16:36:17 +0000 (+0100) Subject: Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb' X-Git-Tag: n3.3~635 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=f09aa73b305073e193af88cf12b52b8f4b609529 Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb' * commit '796dca027be09334d7bbf4f2ac1200e06bb054cb': alac: do not return success if nothing was decoded See e11983bda073f8c63f60509ee753da9fba20ed10 Merged-by: Clément Bœsch --- f09aa73b305073e193af88cf12b52b8f4b609529 diff --cc libavcodec/alac.c index 8d234ed74e,0d2a7ca01d..ae1204bce1 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@@ -460,10 -457,7 +460,10 @@@ static int alac_decode_frame(AVCodecCon avpkt->size * 8 - get_bits_count(&alac->gb)); } - if (alac->channels == ch) - *got_frame_ptr = 1; ++ if (alac->channels == ch && alac->nb_samples) + *got_frame_ptr = 1; + else + av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n"); return avpkt->size; }