diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 17:36:17 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 17:36:37 +0100 |
| commit | f09aa73b305073e193af88cf12b52b8f4b609529 (patch) | |
| tree | fe8d47b7e7ad3a07381ff9db691e4c1e39e96682 /libavcodec/alac.c | |
| parent | 1080b7162f2c6d1e911b91e8097b352a7836b207 (diff) | |
| parent | 796dca027be09334d7bbf4f2ac1200e06bb054cb (diff) | |
| download | ffmpeg-f09aa73b305073e193af88cf12b52b8f4b609529.tar.gz | |
Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'
* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
alac: do not return success if nothing was decoded
See e11983bda073f8c63f60509ee753da9fba20ed10
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 8d234ed74e..ae1204bce1 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -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"); |