Commit 81a59715 authored by Tristan Matthews's avatar Tristan Matthews Committed by Jean-Baptiste Kempf

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

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

(cherry picked from commit 0514bc5f19bbcaf5d4e79d11786861377d58f8e0)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 418ff2ed
...@@ -495,21 +495,10 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -495,21 +495,10 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->i_buffer -= frame.bytesconsumed; p_sys->i_buffer -= frame.bytesconsumed;
if( p_sys->i_buffer > 0 ) 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], memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
p_sys->i_buffer ); p_sys->i_buffer );
} }
}
return p_out; return p_out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment