diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:02:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:03:24 +0200 |
| commit | fcccb4c11dcfcbdbb4b0d6eed5ed276d946c7d13 (patch) | |
| tree | 88be8c89f47677d044a045e8794fe83cd535fa99 /ffserver.c | |
| parent | d6b37de4d42d7bcb1173f6e5c488a02af9470568 (diff) | |
| parent | b7e6da988bfd5def40ccf3476eb8ce2f98a969a5 (diff) | |
Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'
* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
rtpproto: Move rtpproto specific function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c index e7ec17098c..30cc481849 100644 --- a/ffserver.c +++ b/ffserver.c @@ -36,6 +36,7 @@ #include "libavformat/network.h" #include "libavformat/os_support.h" #include "libavformat/rtpdec.h" +#include "libavformat/rtpproto.h" #include "libavformat/rtsp.h" #include "libavformat/avio_internal.h" #include "libavformat/internal.h" |