Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 23:31:20 +0000 (00:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 23:32:03 +0000 (00:32 +0100)
commit3bedc99723a3684260441218a6f5bf42e147db12
tree958722fb0ceb87e4ed9e0a07e6f768a1f3a817ef
parenta277c545b2b507338c02c5c46b17431466da6979
parent67142a8c721c7916c9ad2eb439c14d567aeb88c1
Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'

* commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1':
  roqvideoenc: set enc->avctx in roq_encode_init

See: cf82c426fadf90105e1fb9d5ecd267cc3aa2b288
Merged-by: Michael Niedermayer <michaelni@gmx.at>