Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 02:13:16 +0000 (03:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 02:13:16 +0000 (03:13 +0100)
commitf38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8
treef5705f1f602bbd4ce4d8f0fc1d25e2da23c1bcda
parent504267fb56ba815ff896f9d5a7ce129a8ae674ab
parent847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b
Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'

* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
  movenc: Add an option for delaying writing the moov with empty_moov

Conflicts:
libavformat/movenc.c
libavformat/version.h

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