generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-09 10:07:01 +02:00
commit e914a21ada
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenchint.c
View File

@ -309,11 +309,11 @@ static void describe_payload(const uint8_t *data, int size,
* @param data buffer containing RTP packets * @param data buffer containing RTP packets
* @param size the size of the data buffer * @param size the size of the data buffer
* @param trk the MOVTrack for the hint track * @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 * @return the number of RTP packets in the written hint
*/ */
static int write_hint_packets(AVIOContext *out, const uint8_t *data, 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 curpos;
int64_t count_pos, entries_pos; 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; trk->prev_rtp_ts = ts;
ts_diff = 0; ts_diff = 0;
} }
if (*pts == AV_NOPTS_VALUE) if (*dts == AV_NOPTS_VALUE)
*pts = trk->cur_rtp_ts_unwrapped; *dts = trk->cur_rtp_ts_unwrapped;
count++; count++;
/* RTPpacket header */ /* RTPpacket header */