Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 19:54:41 +0000 (20:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 19:57:11 +0000 (20:57 +0100)
commit1468ff49dfdeaf8e69cb640a326c95ba049c9c98
treeb6f55a90d0d00c15fe8a66bf35987e372a7c3fc5
parent70082a1e533deed6688938232e6e66abbd62b0fa
parent9731cf4001377fa2f75c279072cc2b0cbd57bf8e
Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'

* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
libavformat/movenc.c

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