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)
commit6e69bf4a7eb5e9c74f0049cdaf8ab787faa1a3a6
treebf3f198584824355d9e678b4dbfb6a575c55e237
parent330e892c083e21bf11235425db649a73c28fed99
parent024e5a2d5ff8a94adce48abb15ce2fb471f9d18e
Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'

* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

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