OSDN Git Service

Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 12:41:08 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 12:42:22 +0000 (13:42 +0100)
commit9baef60ae4004c06e839cf1d4d6a5b225bb7d5d1
tree276a13a595b7e4f9440e7fb7b1b181ed8812bb9d
parent94ec27131c7aa4b1a6b2b4830d3c92b02fb5104d
parent8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3
Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'

* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

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