diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-11 23:56:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-11 23:57:11 +0200 |
| commit | 9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc (patch) | |
| tree | 2da7168c9b3926d8a6886af3586fafeee41c5f4e /libavformat/rtspcodes.h | |
| parent | 5f298c679107c3607f6f54c1f38eeb1ba36900a9 (diff) | |
| parent | 183b1c2268529bbb8389d572deb00083c49682dc (diff) | |
| download | ffmpeg-9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for the math function rint
TechSmith Screen Codec 2 decoder
rtsp: Add listen mode
rtsp: Make rtsp_open_transport_ctx() non-static
rtsp: Move rtsp_read_close
rtsp: Parse the mode=receive/record parameter in transport lines
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspcodes.h')
| -rw-r--r-- | libavformat/rtspcodes.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h index 9ee96bfcd0..4245e48642 100644 --- a/libavformat/rtspcodes.h +++ b/libavformat/rtspcodes.h @@ -37,4 +37,18 @@ RTSP_STATUS_SERVICE =503, /**< Service Unavailable */ RTSP_STATUS_VERSION =505, /**< RTSP Version not supported */ }; +enum RTSPMethod { + DESCRIBE, + ANNOUNCE, + OPTIONS, + SETUP, + PLAY, + PAUSE, + TEARDOWN, + GET_PARAMETER, + SET_PARAMETER, + REDIRECT, + RECORD, + UNKNOWN = -1, +}; #endif /* AVFORMAT_RTSPCODES_H */ |