Merge commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:08:04 +0000 (04:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:08:09 +0000 (04:08 +0100)
* commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011':
  dashenc: Use delay_moov

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

Simple merge