github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-30 13:50:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e' into release/2.4

Browse Source 
* commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
	libavcodec/h264_slice.c

See: e8714f6f93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-31 00:13:22 +02:00
parent 2c180cfc5d 3b69f245db
commit b50fa26885
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264_slice.c
View File

@@ -1475,6 +1475,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 "