diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:06:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:06:46 +0200 |
| commit | d563e13a7c7daa03c89636f85305e1839bcb27be (patch) | |
| tree | 0bb0339665aa0d1a0f8b439b64b71b9f8d5a57b7 /libavformat/options.c | |
| parent | 866404df2d4690e0e0958d48754debc812fec5af (diff) | |
| parent | 832129431fd5c693b12c32a1563944c631feaf36 (diff) | |
Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
* commit '832129431fd5c693b12c32a1563944c631feaf36':
lavu: Add version information for av_version_info()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/options.c')
0 files changed, 0 insertions, 0 deletions