diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 05:22:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:03 +0100 |
| commit | 8df5b0250d109a2995238c05128d6a770c03005c (patch) | |
| tree | ad31337f615f8f65f137957ebfe34d0a8e60aef3 | |
| parent | c633427e927e1247f6beda4193c4fb9ed1c4440a (diff) | |
| download | ffmpeg-8df5b0250d109a2995238c05128d6a770c03005c.tar.gz | |
avformat/swfdec: Use side data to communicate w/h changes to the decoder
Fixes reading from freed data
Fixes part of Ticket3539
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1c55d0ff3202a04ebc67a72d72391104e9bdb633)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a9734e7d3017ffc9539eaac2a8acce3ad427f746)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/swfdec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 8fb4aeb37a..ad587ea7d5 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -346,11 +346,15 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) avpriv_set_pts_info(vst, 64, 256, swf->frame_rate); st = vst; } - st->codec->width = width; - st->codec->height = height; if ((res = av_new_packet(pkt, out_len - colormapsize * colormapbpp)) < 0) goto bitmap_end; + if (!st->codec->width && !st->codec->height) { + st->codec->width = width; + st->codec->height = height; + } else { + ff_add_param_change(pkt, 0, 0, 0, width, height); + } pkt->pos = pos; pkt->stream_index = st->index; |