From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 21 Feb 2015 10:40:44 +0000 (+0100)
Subject: Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61;p=ffmpeg

Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'

* commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
	libavcodec/h264_slice.c

See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61