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)
* qatar/master:
  movenc: Rename the timestamp parameter to dts in write_hint_packets

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

Simple merge