From 6f5b1a2ba4cc568b3b8ae11b7dfd4a70fb891680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 28 Aug 2012 14:27:10 +0300 Subject: h264: Check that the codec isn't null before accessing it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes crashes introduced by 2e8f3cbcda5, the codec can be null when called from parsers. Signed-off-by: Martin Storsjö --- libavcodec/h264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a191bc7..2c4f07d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3876,7 +3876,8 @@ again: if (avctx->bits_per_raw_sample != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc) { - if (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU + if (s->avctx->codec && + s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU && (h->sps.bit_depth_luma != 8 || h->sps.chroma_format_idc > 1)) { av_log(avctx, AV_LOG_ERROR, -- cgit v1.1