From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 15 Jan 2015 13:45:01 +0000 (+0100)
Subject: Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
X-Git-Tag: android-x86-6.0-r1~915
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e69bf4a7eb5e9c74f0049cdaf8ab787faa1a3a6;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

6e69bf4a7eb5e9c74f0049cdaf8ab787faa1a3a6