[FFmpeg-cvslog] Merge commit 'c7a983762ab40bca4f85be64995d5398a4307aa5' into release/2.2

Michael Niedermayer git at videolan.org
Mon Jun 1 12:14:05 CEST 2015


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 11:59:12 2015 +0200| [d1423cf68f89d655ed395f052e4cf8915e7f7de0] | committer: Michael Niedermayer

Merge commit 'c7a983762ab40bca4f85be64995d5398a4307aa5' into release/2.2

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

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

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





More information about the ffmpeg-cvslog mailing list