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)
* commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7':
  dashenc: Remove some stray double spaces

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

Simple merge