Merge commit '3670942fae7beb2bfde52557ee95eab5f536e624' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:24:50 +0000 (12:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:24:50 +0000 (12:24 +0100)
* commit '3670942fae7beb2bfde52557ee95eab5f536e624':
  h264: initialize H264Context.avctx in init_thread_copy

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

Simple merge