Merge commit '03fbb6ff3d28f639ea5a35aba3c6dca09c17225d' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:11:40 +0000 (12:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:11:40 +0000 (12:11 +0100)
commitb837d5bf83f982410fd94f6a2aaa24c29e5e770f
treec5a30f3ae6bc8968e2a9f12bdb1e64e5bac075f0
parent36cfee3adc70c6a78a07df4bb16349c4b0893ef4
parent03fbb6ff3d28f639ea5a35aba3c6dca09c17225d
Merge commit '03fbb6ff3d28f639ea5a35aba3c6dca09c17225d' into release/2.2

* commit '03fbb6ff3d28f639ea5a35aba3c6dca09c17225d':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
libavcodec/h264.c

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