From 33dd9147ae859b712c52eecfadc8ff97e3d07575 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Jan 2015 02:10:42 +0100 Subject: demux_mkv: improve robustness against broken libavcodec parsers The VP9 codec parser has a bug: it doesn't set the data/size pointers passed to it. As I understand, it must always do this, and in fact, if it doesn't some libavcodec generic code would be in trouble too. This helps with #1448, but is not the full fix for it. The codec parser must be fixed in libavcodec itself. --- demux/demux_mkv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index ed5b2c74a9..2b93148747 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2272,8 +2272,8 @@ static bool mkv_parse_packet(mkv_track_t *track, bstr *raw, bstr *out) } if (track->av_parser && track->av_parser_codec) { while (raw->len) { - uint8_t *data; - int size; + uint8_t *data = NULL; + int size = 0; int len = av_parser_parse2(track->av_parser, track->av_parser_codec, &data, &size, raw->start, raw->len, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0); -- cgit v1.2.3