Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:05:14 +0000 (19:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:05:14 +0000 (19:05 +0100)
commit1172107d570baa6f01d5c11584090a8cbe552e14
tree541ba712b7623f8a183d6d1c0c1aafe548a66d1b
parenta22079b8193b3ce3119b4440a4972098cd141e4e
parent2686dab45eec54f99866413153aa0b36381e48be
Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4

* commit '2686dab45eec54f99866413153aa0b36381e48be':
  h264: initialize H264Context.avctx in init_thread_copy

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