[vlc-commits] Revert "faad: drop byte of padding for raw streams"

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Sun Dec 14 23:50:03 2014 -0500| [81a597153ea6ffd995555ef0a5c061acbe5fe7d8] | committer: Jean-Baptiste Kempf

Revert "faad: drop byte of padding for raw streams"

This reverts commit 937911d559051522554ac6f0d6d35fc0836d541a which was
obsoleted by commit 0fd580b8c0f1590d2b01a5062b4a1d616cd80e1c.

(cherry picked from commit 0514bc5f19bbcaf5d4e79d11786861377d58f8e0)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=81a597153ea6ffd995555ef0a5c061acbe5fe7d8
---

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

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 54191bc..a51861e 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -496,19 +496,8 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         p_sys->i_buffer -= frame.bytesconsumed;
         if( p_sys->i_buffer > 0 )
         {
-            /* drop byte of raw AAC padding (if present) */
-            if ( frame.header_type == RAW &&
-                 p_sys->i_buffer == 1 &&
-                 p_sys->p_buffer[0] == 0x21 &&
-                 p_sys->p_buffer[frame.bytesconsumed] == 0 )
-            {
-                p_sys->i_buffer = 0;
-            }
-            else
-            {
-                memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
-                         p_sys->i_buffer );
-            }
+            memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
+                     p_sys->i_buffer );
         }
 
         return p_out;