Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 23:10:13 +0000 (01:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 23:10:13 +0000 (01:10 +0200)
commit20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7
tree921f790635d6f0e92a209dad1a016eeef072b7c5
parentca5a77191b79e8ff46402e2db6f1bf18d034f9e8
parentdad12ce452a9d69c0d9d53c375003947d5f1b02e
Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'

* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
  movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov

Conflicts:
libavformat/movenc.c

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