Merge commit '2889c5e16711770437f380f1bead5f72c6a0b17a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 10:24:00 +0000 (11:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:09:51 +0000 (12:09 +0100)
commit76fef5cd27861ec3b574a06e8be6ea03bcdde7a5
tree8836d8d9b2aa58e713b1e99f21c9adfd2854328e
parent4f8540ba40b79cacf14600c0ac2da5f5d5dc604f
parent2889c5e16711770437f380f1bead5f72c6a0b17a
Merge commit '2889c5e16711770437f380f1bead5f72c6a0b17a'

* commit '2889c5e16711770437f380f1bead5f72c6a0b17a':
  movenc: Heuristically set the duration of the last sample in a fragment if not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h
tests/ref/fate/sub-movtextenc