Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-25 14:50:26 +0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-26 02:50:44 +0400
commitb7154758de3f2ec46da1096a8a95645d3d315c39 (patch)
treeee3243f37c3062f7fca59914dfd7e1fe807ea3eb
parentcd7d575e90ceada5a9914d029124388d4993cc9e (diff)
avformat/wavdec: Fix smv packet interleaving
This strips the relative timestamp "flag" off. Fixes Ticket2849 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6abb9eb525239f954ec12e52fc209e6dfce2a6d4)
-rw-r--r--libavformat/wavdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 64dd8678b1..7f3eaf0748 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -462,8 +462,8 @@ static int wav_read_packet(AVFormatContext *s, AVPacket *pkt)
if (wav->smv_data_ofs > 0) {
int64_t audio_dts, video_dts;
smv_retry:
- audio_dts = s->streams[0]->cur_dts;
- video_dts = s->streams[1]->cur_dts;
+ audio_dts = (int32_t)s->streams[0]->cur_dts;
+ video_dts = (int32_t)s->streams[1]->cur_dts;
if (audio_dts != AV_NOPTS_VALUE && video_dts != AV_NOPTS_VALUE) {
/*We always return a video frame first to get the pixel format first*/