RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Clément Bœsch 2017-03-19 17:36:17 +01:00
parent 1080b7162f 796dca027b
commit f09aa73b30
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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)); avpkt->size * 8 - get_bits_count(&alac->gb));
} }
if (alac->channels == ch) if (alac->channels == ch && alac->nb_samples)
*got_frame_ptr = 1; *got_frame_ptr = 1;
else else
av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n"); av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n");