Browse Source

Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'

* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
  alac: do not return success if nothing was decoded

See e11983bda0

Merged-by: Clément Bœsch <u@pkh.me>
tags/n3.3
Clément Bœsch 9 years ago
parent
commit
f09aa73b30
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/alac.c

+ 1
- 1
libavcodec/alac.c View File

@@ -460,7 +460,7 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
avpkt->size * 8 - get_bits_count(&alac->gb));
}

if (alac->channels == ch)
if (alac->channels == ch && alac->nb_samples)
*got_frame_ptr = 1;
else
av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n");


Loading…
Cancel
Save