Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-05-25 23:30:10 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 05:43:39 +0300
commitb46ae71f29a1ebffd4040594214b3e3d69d96830 (patch)
tree2d01d9fcb1150a3ff297b5194344c31d2907b7cb
parentc40aa4704f516aa874514b9b501a4e8fa368cb0c (diff)
h264: Make sure reinit failures mark the context as not initialized
(cherry picked from commit 0181ae9af2de1526464d23209b82e6674d362f5d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_slice.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index d8b7bc7fa9..b3fdc992e6 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1454,6 +1454,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
if (h->context_initialized &&
(must_reinit || needs_reinit)) {
+ h->context_initialized = 0;
if (h != h0) {
av_log(h->avctx, AV_LOG_ERROR,
"changing width %d -> %d / height %d -> %d on "