Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:01:34 +0000 (02:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:01:34 +0000 (02:01 +0200)
commit329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8
treec2345ac80aad15d9467f02808fef71280cf6dc7d
parenta973e01501bc3ca5c61d778f97f350837d4ed481
parent24c788f4878729a42150581d7ed7e9a11daf874d
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'

* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h
libavformat/version.h