[FFmpeg-cvslog] avformat/wavdec: Fix smv packet interleaving

Michael Niedermayer git at videolan.org
Sat Oct 26 01:30:17 CEST 2013


ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 25 12:50:26 2013 +0200| [b7154758de3f2ec46da1096a8a95645d3d315c39] | committer: Carl Eugen Hoyos

avformat/wavdec: Fix smv packet interleaving

This strips the relative timestamp "flag" off.

Fixes Ticket2849

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6abb9eb525239f954ec12e52fc209e6dfce2a6d4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7154758de3f2ec46da1096a8a95645d3d315c39
---

 libavformat/wavdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 64dd867..7f3eaf0 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*/



More information about the ffmpeg-cvslog mailing list