Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 14:06:32 +0000 (15:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 14:08:05 +0000 (15:08 +0100)
commit5972bcfac9106b9615ce1277deeaf6460ff738fc
treee8e5f5201179a7562ac509c7211696e2b920c071
parent06fe29c41d3a93bd937295523477e4bd6eed934c
parent700687ebe07ac8b7a5cf5fd2c4892ea07a827080
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
tools/qt-faststart.c

See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1
Merged-by: Michael Niedermayer <michaelni@gmx.at>