Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:44:57 +0000 (15:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:45:04 +0000 (15:45 +0200)
commitdda7bd13b3498243a199c77aac4fca602147828f
treebb50e6a11206a50a1b3f6f2e09e37b88e6cf3ce1
parent8c320b3c0831b181585c8285e0b43d1a62fecc52
parent5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91
Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'

* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
  rtmp: Unbreak get_packet

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