Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)
* commit 'b469832de993dabbfe037bef59c68e90e82ebca5':
  rc4: extend av_rc4_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/rc4.h

diff --cc libavutil/rc4.h
Simple merge