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)
commit1e16492b989e0f1bd262be6aaf5ebf7857f46dea
treeab22e22e2fe64e0e847a1503ffb8fff4c32e3542
parent940f5c08e5125fd2ef235229aca504708ff282f0
parentc6074a30ba3b5fb4319ee6ee599656d58548cdc8
Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'

* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
  opt: Fix the documentation mentioning av_set_string3

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