aboutsummaryrefslogtreecommitdiffstats
path: root/version.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 02:01:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 02:01:34 +0200
commit329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (patch)
treec2345ac80aad15d9467f02808fef71280cf6dc7d /version.sh
parenta973e01501bc3ca5c61d778f97f350837d4ed481 (diff)
parent24c788f4878729a42150581d7ed7e9a11daf874d (diff)
downloadffmpeg-329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8.tar.gz
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
* commit '24c788f4878729a42150581d7ed7e9a11daf874d': Remove obsolete FF_API_REFERENCE_DTS cruft. Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions