Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 13:09:31 +0000 (14:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 13:09:35 +0000 (14:09 +0100)
* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

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

Simple merge
Simple merge