diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 10:07:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 10:07:23 +0200 |
| commit | e914a21ada123c37086057ade35619c1df41cb9a (patch) | |
| tree | 920f9c1e20a9d886f69181061019aa3f37aaff19 /libavformat | |
| parent | 848295c2eeac23c07d9cb97a5200fa931bdd06f4 (diff) | |
| parent | 0677ddebc6e93c3aee1504be45cec1e8d7299581 (diff) | |
| download | ffmpeg-e914a21ada123c37086057ade35619c1df41cb9a.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenchint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index 81acc4642a..943680e9ad 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -309,11 +309,11 @@ static void describe_payload(const uint8_t *data, int size, * @param data buffer containing RTP packets * @param size the size of the data buffer * @param trk the MOVTrack for the hint track - * @param pts pointer where the timestamp for the written RTP hint is stored + * @param dts pointer where the timestamp for the written RTP hint is stored * @return the number of RTP packets in the written hint */ static int write_hint_packets(AVIOContext *out, const uint8_t *data, - int size, MOVTrack *trk, int64_t *pts) + int size, MOVTrack *trk, int64_t *dts) { int64_t curpos; int64_t count_pos, entries_pos; @@ -357,8 +357,8 @@ static int write_hint_packets(AVIOContext *out, const uint8_t *data, trk->prev_rtp_ts = ts; ts_diff = 0; } - if (*pts == AV_NOPTS_VALUE) - *pts = trk->cur_rtp_ts_unwrapped; + if (*dts == AV_NOPTS_VALUE) + *dts = trk->cur_rtp_ts_unwrapped; count++; /* RTPpacket header */ |