git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1080b71
)
Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'
author
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 16:36:17 +0000
(17:36 +0100)
committer
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 16:36:37 +0000
(17:36 +0100)
* commit '
796dca027be09334d7bbf4f2ac1200e06bb054cb
':
alac: do not return success if nothing was decoded
See
e11983bda073f8c63f60509ee753da9fba20ed10
Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/alac.c
patch
|
blob
|
history
diff --git
a/libavcodec/alac.c
b/libavcodec/alac.c
index
8d234ed
..
ae1204b
100644
(file)
--- 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");