Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 10:41:29 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 10:41:29 +0000 (11:41 +0100)
commit9ebfe38f3873eafacff9b0933cbf9b97198ec020
treef0d3972ac8c353dcf30838ad420e9daf03da8b98
parent4342b346d273366438f10a1cc665d0c2db2af469
parent9a5ac36b69ede4563e9ecd734141b12ea3280fbc
Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'

* commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc':
  movenc: Require samples before trying to write edts

Conflicts:
libavformat/movenc.c

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