Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:02:28 +0000 (11:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:02:37 +0000 (11:02 +0200)
* commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b':
  rtmp: Use PRId64 when needed.

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

Simple merge