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)
commit983778f1f68a12b1e307572f48390428c0421a8e
tree4bd953ce2d75214302b16549548f4cc44495fe9c
parentb0ba8a23b61506766f8497e2bf972da2077d235a
parentc5e7ea13d2d4da0c5da91973a547afff6fe9e011
Merge commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011'

* commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011':
  dashenc: Use delay_moov

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