[FFmpeg-cvslog] wmall: output packet only if we have decoded some samples

Kostya Shishkov git at videolan.org
Thu Mar 22 21:12:06 CET 2012


ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Wed Mar 21 19:10:43 2012 +0100| [87818103a0d8e5021b950ea5906031a20d0d193b] | committer: Kostya Shishkov

wmall: output packet only if we have decoded some samples

Also set CODEC_CAP_DELAY to indicate that decoder may still have some
undecoded data left in internal buffer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87818103a0d8e5021b950ea5906031a20d0d193b
---

 libavcodec/wmalosslessdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 6bd8bfb..795642e 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1229,7 +1229,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr,
     }
 
     *(AVFrame *)data = s->frame;
-    *got_frame_ptr   = 1;
+    *got_frame_ptr   = s->frame.nb_samples > 0;
     s->packet_offset = get_bits_count(gb) & 7;
 
     return (s->packet_loss) ? AVERROR_INVALIDDATA : get_bits_count(gb) >> 3;
@@ -1243,6 +1243,6 @@ AVCodec ff_wmalossless_decoder = {
     .priv_data_size = sizeof(WmallDecodeCtx),
     .init           = decode_init,
     .decode         = decode_packet,
-    .capabilities   = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+    .capabilities   = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY,
     .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"),
 };



More information about the ffmpeg-cvslog mailing list