Merge commit 'a1a143adb0fd11c474221431417cff25db7d920f'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:08:25 +0000 (18:08 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:29:05 +0000 (18:29 -0300)
commitf858a6e27817930817303b8ffb367087d82f70be
tree379d5e519be18f8f493fe99553b68b4c4529b37e
parentc83c164f05cba9e7cdb11c9dcd4fb87b90eb6c6d
parenta1a143adb0fd11c474221431417cff25db7d920f
Merge commit 'a1a143adb0fd11c474221431417cff25db7d920f'

* commit 'a1a143adb0fd11c474221431417cff25db7d920f':
  rtmp: Rename packet types to closer match the spec

Merged-by: James Almer <jamrial@gmail.com>
libavformat/rtmppkt.c
libavformat/rtmppkt.h
libavformat/rtmpproto.c