Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 13:45:01 +0000 (14:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 13:45:29 +0000 (14:45 +0100)
* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmppkt.c

Simple merge