Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 08:07:01 +0000 (10:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 08:07:23 +0000 (10:07 +0200)
commite914a21ada123c37086057ade35619c1df41cb9a
tree920f9c1e20a9d886f69181061019aa3f37aaff19
parent848295c2eeac23c07d9cb97a5200fa931bdd06f4
parent0677ddebc6e93c3aee1504be45cec1e8d7299581
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Rename the timestamp parameter to dts in write_hint_packets

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