Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:54:37 +0000 (23:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:54:52 +0000 (23:54 +0100)
* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
  opt: Fix the documentation mentioning av_set_string3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/opt.h

diff --cc libavutil/opt.h
Simple merge