[FFmpeg-cvslog] Merge commit '9f6c36d961d27283808310e3ca1d8390b55fce9b' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 20:37:23 2015 +0200| [e6f17337cf2081ccbf4635095ec3871805185867] | committer: Michael Niedermayer

Merge commit '9f6c36d961d27283808310e3ca1d8390b55fce9b' into release/2.4

* commit '9f6c36d961d27283808310e3ca1d8390b55fce9b':
  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=e6f17337cf2081ccbf4635095ec3871805185867
---