Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:45:29 +0000 (02:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:45:34 +0000 (02:45 +0100)
commitfb22e5ae4585c31fcf4ebe1d255f6eeb24d600e3
treea61a8141dd29439c576208517bffb878e7713d7f
parente7521d9771eac5ba07558b2b2dba1155e57b9670
parent46808fdf04ab113df374157b90b506eb3110daf2
Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'

* commit '46808fdf04ab113df374157b90b506eb3110daf2':
  movenc: Enable editlists by default if delay_moov is enabled

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