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)
* commit '2686dab45eec54f99866413153aa0b36381e48be':
  h264: initialize H264Context.avctx in init_thread_copy

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

Simple merge