aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-07-03 00:02:44 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-07-07 23:35:00 +0200
commit42e7a5b3c704985c2c18970cc94a837b413df9d9 (patch)
tree0829387b0d98cd7c313281b9d835212a78e0b43b
parentf9020d514e9ed5043496a710b36daba1ab182e97 (diff)
downloadffmpeg-42e7a5b3c704985c2c18970cc94a837b413df9d9.tar.gz
wmalosslessdec: reset frame->nb_samples on packet loss
Otherwise a frame with non-zero nb_samples but without any data can be returned. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavcodec/wmalosslessdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 8094db3b2a..0c85c83996 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1005,6 +1005,7 @@ static int decode_frame(WmallDecodeCtx *s)
if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0) {
/* return an error if no frame could be decoded at all */
s->packet_loss = 1;
+ s->frame->nb_samples = 0;
return ret;
}
for (i = 0; i < s->num_channels; i++) {