From 34c5a6660a9e5e3cf301691bb29d011638953dc2 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 18 Apr 2014 12:07:52 +0000 Subject: h264: codec reinit: remove statements without effect avctx->coded_{height,width} will always equal h->{height,width} since init_dimensions() does that explicitly, Size changes are detected by changes in mb_{height,width} earlier and propagated through the needs_reinit variable. --- libavcodec/h264_slice.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 897c8ebdbb..aed2378f28 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1306,10 +1306,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0) } } - if (h->context_initialized && - (h->width != h->avctx->coded_width || - h->height != h->avctx->coded_height || - needs_reinit)) { + if (h->context_initialized && needs_reinit) { if (h != h0) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " -- cgit v1.2.3