Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:52:29 +0000 (11:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:53:00 +0000 (11:53 +0100)
commit4b55a7e1ce686c786825b2b3e3b5115b5bf55ffa
tree211ed72550a974b7c0bbd9d5367642711182c0a9
parent6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61
parenta06b0b1295c51d100101e0ca0434e199ad6de6b5
Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'

* commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5':
  h264: initialize H264Context.avctx in init_thread_copy

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