[FFmpeg-cvslog] Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 12 00:31:20 2015 +0100| [3bedc99723a3684260441218a6f5bf42e147db12] | committer: Michael Niedermayer

Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bedc99723a3684260441218a6f5bf42e147db12
---