h264: Make sure reinit failures mark the context as not initialized
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 25 May 2015 20:30:10 +0000 (22:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 00:13:12 +0000 (02:13 +0200)
commit04bb8cc842125381a966e064fcee3e7fe8ee6386
tree7dad3e1afb1d054ea9c3237790a699334ed3cd31
parent03c80a740043bd8cf35dc18db84ed1ffd4c08ddc
h264: Make sure reinit failures mark the context as not initialized

(cherry picked from commit 3b69f245dbe6e2016659a45c4bfe284f6c5ac57e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavcodec/h264_slice.c
(cherry picked from commit 964fef3f3ced60e67831549df223bc177e1537c9)

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

libavcodec/h264.c
libavcodec/h264.c