Merged revisions 52763 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 30 Jan 2007 00:16:38 +0000 (00:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 30 Jan 2007 00:16:38 +0000 (00:16 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r52763 | russell | 2007-01-29 18:15:50 -0600 (Mon, 29 Jan 2007) | 13 lines

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/trunk@52764 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index 865c13a..66f0b97 100644 (file)
@@ -7671,10 +7671,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;