[vlc-commits] avcodec: use correct buffer size in fill_audio_frame

Ilkka Ollakka git at videolan.org
Sun Sep 22 16:08:55 CEST 2013


vlc/vlc-2.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Sep 22 16:54:09 2013 +0300| [7f85cff2140cbd278a45313519511bc7fcb1060b] | committer: Ilkka Ollakka

avcodec: use correct buffer size in fill_audio_frame
(cherry picked from commit eb91162e8664678397f2631d3e956f2647964ebf)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=7f85cff2140cbd278a45313519511bc7fcb1060b
---

 modules/codec/avcodec/encoder.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index c16efac..8193d07 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -1180,7 +1180,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
         }
         if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_in.audio.i_channels,
                 p_sys->p_context->sample_fmt, p_sys->b_planar ? p_sys->p_interleave_buf : p_sys->p_buffer,
-                leftover + buffer_delay,
+                p_sys->i_buffer_out,
                 align) < 0 )
         {
             msg_Err( p_enc, "filling error on fillup" );



More information about the vlc-commits mailing list