Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:02:33 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:03:24 +0000 (12:03 +0200)
commitfcccb4c11dcfcbdbb4b0d6eed5ed276d946c7d13
tree88be8c89f47677d044a045e8794fe83cd535fa99
parentd6b37de4d42d7bcb1173f6e5c488a02af9470568
parentb7e6da988bfd5def40ccf3476eb8ce2f98a969a5
Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'

* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
  rtpproto: Move rtpproto specific function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c
libavformat/rtpdec.h
libavformat/rtpproto.c
libavformat/rtpproto.h
libavformat/rtsp.c
libavformat/rtspdec.c