[vlc-devel] [vlc-commits] ADTS frame length includes the ADTS header

[Rafaël Carré]

Le 03/03/2012 15:27, Rafaël Carré a écrit :
> vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Mar  3 15:26:48 2012 -0500| [925762bc4ceb8153b486e22d330b3e3572e6c4df] | committer: Rafaël Carré
> 
> ADTS frame length includes the ADTS header
> 
> http://wiki.multimedia.cx/index.php?title=ADTS
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=925762bc4ceb8153b486e22d330b3e3572e6c4df
> ---
> 
>  modules/mux/mpeg/ts.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
> index cd21b8a..2555951 100644
> --- a/modules/mux/mpeg/ts.c
> +++ b/modules/mux/mpeg/ts.c
> @@ -1591,7 +1591,7 @@ static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt )
>      if( !p_data || p_fmt->i_extra < 2 || !p_extra )
>          return p_data; /* no data to construct the headers */
>  
> -    size_t frame_length = p_data->i_buffer;
> +    size_t frame_length = p_data->i_buffer + ADTS_HEADER_SIZE;

Looks like it's time for me to take a break since I don't even test my
patches properly (I tested with + 7 then changed to the define before push).

Merged this commit and the fix into the previous one to not clutter log.