RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d' 

* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
  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-30 21:33:00 +02:00
parent 7d1cfbbc3e 0181ae9af2
commit e9d646f44c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264_slice.c
View File

@ -1334,6 +1334,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
if (h->context_initialized && if (h->context_initialized &&
(must_reinit || needs_reinit)) { (must_reinit || needs_reinit)) {
h->context_initialized = 0;
if (sl != h->slice_ctx) { if (sl != h->slice_ctx) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"changing width %d -> %d / height %d -> %d on " "changing width %d -> %d / height %d -> %d on "