summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-07 12:58:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-07 12:58:43 +0100
commit94ec27131c7aa4b1a6b2b4830d3c92b02fb5104d (patch)
tree3c229b654f42e9efe2f6fac645e1c27a9823c0c4
parentd540e7577a4cfdb166d0287b619c30969ca749b4 (diff)
parent48cfb5f4114048383a4ee85b2f500eefce24cad2 (diff)
downloadffmpeg-94ec27131c7aa4b1a6b2b4830d3c92b02fb5104d.tar.gz
Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'
* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2': rtmppkt: Add a descriptive comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtmppkt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 3c99adcbf0..5f955079f1 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -194,7 +194,7 @@ static int rtmp_packet_read_one_chunk(URLContext *h, RTMPPacket *p,
type = prev_pkt[channel_id].type;
extra = prev_pkt[channel_id].extra;
- hdr >>= 6;
+ hdr >>= 6; // header size indicator
if (hdr == RTMP_PS_ONEBYTE) {
ts_field = prev_pkt[channel_id].ts_delta;
} else {