Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'
authorJames Almer <jamrial@gmail.com>
Tue, 21 Mar 2017 20:04:44 +0000 (17:04 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 21 Mar 2017 20:04:44 +0000 (17:04 -0300)
commitde36e98a16f495d051e301653115ebf99a7d7929
tree845f2c5c9d6fac4ab618c00a743b89466f97877b
parent4de591e6fb7361bd417dcd9563672ed0ad8b361b
parent75c1db6152c7c90c7ce28c9adb945028e5512c4f
Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'

* commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f':
  avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL

Merged-by: James Almer <jamrial@gmail.com>
libavformat/avio.h