[vlc-commits] codec: faad: fix !reordering case

Thomas Guillem git at videolan.org
Fri Dec 8 19:00:00 CET 2017


vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Dec  8 18:45:50 2017 +0100| [c3736f0260e972096e9a7869b18f77495c948cd2] | committer: Thomas Guillem

codec: faad: fix !reordering case

Regression from 790d6b1f5437b1307c831e6ac509baa40d69e3fd

(cherry picked from commit 001b765d6699676077f147471f62ef701a5f478c)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c3736f0260e972096e9a7869b18f77495c948cd2
---

 modules/codec/faad.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 0b7491d6a6..01aaafcb07 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -550,6 +550,8 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
                 DoReordering( (uint32_t *)p_out->p_buffer, samples,
                               frame.samples / frame.channels, frame.channels,
                               pi_neworder_table );
+            else
+                 memcpy( p_out->p_buffer, samples, p_out->i_buffer );
 
             if( p_sys->b_discontinuity )
             {



More information about the vlc-commits mailing list