Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:41:03 +0000 (15:41 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:41:03 +0000 (15:41 +0000)
commit48847ee3577f4a978b40fbe9949e689554d74b3d
tree7a2bcbd97cafa10a773e32b626c54918961f3a93
parent04747c5a73af4a83574dde878688d2f8406034b4
parentd082078a88da3b3e926197d0d2aa9fa322123b76
Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'

* commit 'd082078a88da3b3e926197d0d2aa9fa322123b76':
  dashenc: eliminate ffurl_* usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/dashenc.c