From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 9 Jul 2013 08:07:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n2.0~25
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e914a21ada123c37086057ade35619c1df41cb9a

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>
---

e914a21ada123c37086057ade35619c1df41cb9a