diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:58:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:58:46 +0200 |
| commit | 3ed3aaab32f58dab2a841a95e032e871d928fb7f (patch) | |
| tree | 86cdfb67870860e42d568d965ca1cfff242cd586 /libavformat/smacker.c | |
| parent | 8012f93ed8afbf0b45fa378085cd4b000e30057f (diff) | |
| parent | 851bc1d6be0c7485609e0208d188f3edbc4ade13 (diff) | |
| download | ffmpeg-3ed3aaab32f58dab2a841a95e032e871d928fb7f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: assign video frame PTS
matroskadec: export full wavpack blocks.
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smacker.c')
| -rw-r--r-- | libavformat/smacker.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 7f270b48b1..e04a214ff3 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -338,6 +338,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) if(ret != frame_size) return AVERROR(EIO); pkt->stream_index = smk->videoindex; + pkt->pts = smk->cur_frame; pkt->size = ret + 769; smk->cur_frame++; smk->nextpos = avio_tell(s->pb); |