Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:52:59 +0000 (12:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:53:02 +0000 (12:53 +0100)
* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
  rtmppkt: Handle extended timestamp field even for one-byte header

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

Simple merge
Simple merge