Re: [FFmpeg-devel] [PATCH] avformat/flvdec: don't propagate empty extradata

2018-08-24 Thread James Almer 
On 8/24/2018 4:27 AM, Paul B Mahol wrote:
> On 8/24/18, James Almer  wrote:
>> Fixes ticket #7379
>>
>> Signed-off-by: James Almer 
>> ---
>>  libavformat/flvdec.c | 6 ++
>>  1 file changed, 6 insertions(+)
>>
> 
> Probably OK.

Pushed. thanks.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/flvdec: don't propagate empty extradata

2018-08-24 Thread Paul B Mahol 
On 8/24/18, James Almer  wrote:
> Fixes ticket #7379
>
> Signed-off-by: James Almer 
> ---
>  libavformat/flvdec.c | 6 ++
>  1 file changed, 6 insertions(+)
>

Probably OK.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avformat/flvdec: don't propagate empty extradata

2018-08-23 Thread James Almer 
Fixes ticket #7379

Signed-off-by: James Almer 
---
 libavformat/flvdec.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 93c7f85237..a2dea464e3 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -753,6 +753,9 @@ static int flv_read_close(AVFormatContext *s)
 
 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
 {
+if (!size)
+return 0;
+
 av_freep(>codecpar->extradata);
 if (ff_get_extradata(s, st->codecpar, s->pb, size) < 0)
 return AVERROR(ENOMEM);
@@ -763,6 +766,9 @@ static int flv_get_extradata(AVFormatContext *s, AVStream 
*st, int size)
 static int flv_queue_extradata(FLVContext *flv, AVIOContext *pb, int stream,
int size)
 {
+if (!size)
+return 0;
+
 av_free(flv->new_extradata[stream]);
 flv->new_extradata[stream] = av_mallocz(size +
 AV_INPUT_BUFFER_PADDING_SIZE);
-- 
2.18.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel