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)
* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

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

Simple merge