diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-30 21:33:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-30 21:33:00 +0200 |
| commit | e9d646f44c6a3208e35a055ba2154f25ba497fa2 (patch) | |
| tree | 2aadac553f0b26b3392235376d992eaab4ec087f | |
| parent | 7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55 (diff) | |
| parent | 0181ae9af2de1526464d23209b82e6674d362f5d (diff) | |
| download | ffmpeg-e9d646f44c6a3208e35a055ba2154f25ba497fa2.tar.gz | |
Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
h264: Make sure reinit failures mark the context as not initialized
Conflicts:
libavcodec/h264_slice.c
See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 80a387d79c..f12e4b75e8 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1334,6 +1334,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (h->context_initialized && (must_reinit || needs_reinit)) { + h->context_initialized = 0; if (sl != h->slice_ctx) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " |