[FFmpeg-devel] [PATCH] lavf/mpegtsenc: move putstr8 definition up

[Benoit Fouet]

Hi,

Le 19/05/2016 18:45, Stefano Sabatini a écrit :
> This allows to use the function in a future commit.
> ---
>   libavformat/mpegtsenc.c | 34 +++++++++++++++++-----------------
>   1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index 93cbac1..5f22032 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -253,6 +253,23 @@ static void mpegts_write_pat(AVFormatContext *s)
>                             data, q - data);
>   }
>   
> +/* NOTE: !str is accepted for an empty string */
> +static void putstr8(uint8_t **q_ptr, const char *str)
> +{
> +    uint8_t *q;
> +    int len;
> +
> +    q = *q_ptr;
> +    if (!str)
> +        len = 0;
> +    else
> +        len = strlen(str);
> +    *q++ = len;
> +    memcpy(q, str, len);

Side note on this one, unrelated to your change.
Isn't this undefined behavior to call memcpy with one of the pointers 
being NULL?

-- 
Ben