Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:03:35 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:03:51 +0000 (19:03 +0100)
commita8eb02da80dfc04fdc75e50db63e45075821c134
treeda73e2533935d64115d6cda70991b6206e1741c2
parentdbda57469456f03ed7ba921b97744751d0ccee39
parent1dbfaa34e615606cb3f1a3ecabb117e354459edc
Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4

* commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc':
  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>
libavcodec/h264_slice.c