diff options
| author | trueice@gmail.com <trueice@gmail.com> | 2010-05-25 07:01:04 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-05-25 07:01:04 +0000 |
| commit | aae9a0931cf352f00b9a056f31ca257e7a3f927e (patch) | |
| tree | b03a52b5d7be8641431013154a35262e71c0714b /libavformat/rtmpproto.c | |
| parent | cc46005f50aff0eecda9f21e8d4bf63868818bdd (diff) | |
| download | ffmpeg-aae9a0931cf352f00b9a056f31ca257e7a3f927e.tar.gz | |
24l trocadero: RTMP reader forgot to shift high byte of timestamp to its
proper position
Patch by trueice (his gmail account is obvious)
Originally committed as revision 23305 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 4edbffab62..7d858ccc6a 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -752,7 +752,7 @@ static int get_packet(URLContext *s, int for_header) data_size = bytestream_get_be24(&next); p=next; cts = bytestream_get_be24(&next); - cts |= bytestream_get_byte(&next); + cts |= bytestream_get_byte(&next) << 24; if (pts==0) pts=cts; ts += cts - pts; |