h264: Make sure reinit failures mark the context as not initialized

(cherry picked from commit 3b69f245db)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

Conflicts:
	libavcodec/h264_slice.c
(cherry picked from commit 964fef3f3c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavcodec/h264.c
This commit is contained in:
Luca Barbato
2015-05-25 22:30:10 +02:00
committed by Michael Niedermayer
parent 03c80a7400
commit 04bb8cc842

View File

@@ -3389,7 +3389,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h->height != h->avctx->coded_height ||
must_reinit ||
needs_reinit)) {
h->context_initialized = 0;
if (h != h0) {
av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
"slice %d\n", h0->current_slice + 1);