Merge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:50:17 +0000 (01:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:50:53 +0000 (01:50 +0100)
* commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b':
  dashenc: Fix writing of timelines that don't start at t=0

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

Simple merge