Merge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:57:17 +0000 (01:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:57:21 +0000 (01:57 +0100)
commit0ffb61e8cabf35e6022a33a1324fe9ef58ab85a5
tree0d3075db4303c9baf14c5f2a12ab40be6c9a2a2e
parente5a3766767a104e6fdd7adcfafb8e90da5872041
parent8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7
Merge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'

* commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7':
  dashenc: Remove some stray double spaces

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c