On 10/3/2018 4:15 PM, Luca Barbato wrote:
> From: James Almer <[email protected]>
>
> Reviewed-by: Derek Buitenhuis <[email protected]>
> Signed-off-by: James Almer <[email protected]>
> Signed-off-by: Luca Barbato <[email protected]>
> ---
> libavcodec/extract_extradata_bsf.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/libavcodec/extract_extradata_bsf.c
> b/libavcodec/extract_extradata_bsf.c
> index 10d108054a..ed5d90b246 100644
> --- a/libavcodec/extract_extradata_bsf.c
> +++ b/libavcodec/extract_extradata_bsf.c
> @@ -114,6 +114,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx,
> AVPacket *pkt,
> ret = AVERROR(ENOMEM);
> goto fail;
> }
> + memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
>
> *data = extradata;
> *size = extradata_size;
> @@ -137,6 +138,8 @@ static int extract_extradata_h2645(AVBSFContext *ctx,
> AVPacket *pkt,
> pkt->buf = filtered_buf;
> pkt->data = filtered_buf->data;
> pkt->size = filtered_data - filtered_buf->data;
> +
> + memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
> }
> }
>
> @@ -171,6 +174,7 @@ static int extract_extradata_vc1(AVBSFContext *ctx,
> AVPacket *pkt,
> return AVERROR(ENOMEM);
>
> memcpy(*data, pkt->data, extradata_size);
> + memset(*data + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
> *size = extradata_size;
>
> if (s->remove) {
> @@ -202,6 +206,8 @@ static int extract_extradata_mpeg124(AVBSFContext *ctx,
> AVPacket *pkt,
> return AVERROR(ENOMEM);
>
> memcpy(*data, pkt->data, *size);
> + memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
> + memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
Duplicated line.
LGTM otherwise.
>
> if (s->remove) {
> pkt->data += *size;
>
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel