From a46e6d74df99453ebda173be4de41316989e959a Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 30 Jan 2007 00:15:50 +0000 Subject: [PATCH] Merged revisions 52762 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r52762 | russell | 2007-01-29 18:15:06 -0600 (Mon, 29 Jan 2007) | 5 lines Fix the extraction of the timestamp from video frames. It was using the mapping for a mini-frame instead of a video-frame, which caused it to get invalid data. (issue #8795, mihai) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52763 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1c057d2b68..5bbba7d914 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -7503,10 +7503,10 @@ retryowner2: f.data = NULL; #ifdef IAXTESTS if (test_resync) { - fr->ts = (iaxs[fr->callno]->last & 0xFFFF8000L) | ((ntohs(mh->ts) + test_resync) & 0x7fff); + fr->ts = (iaxs[fr->callno]->last & 0xFFFF8000L) | ((ntohs(vh->ts) + test_resync) & 0x7fff); } else #endif /* IAXTESTS */ - fr->ts = (iaxs[fr->callno]->last & 0xFFFF8000L) | (ntohs(mh->ts) & 0x7fff); + fr->ts = (iaxs[fr->callno]->last & 0xFFFF8000L) | (ntohs(vh->ts) & 0x7fff); } else { /* A mini frame */ f.frametype = AST_FRAME_VOICE;