diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
| commit | 8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (patch) | |
| tree | e0bfc884210a851e22fd1acabb6b9e873cef5bb4 /libavformat/rtsp.h | |
| parent | ea96feddb7bb813c1e0c9befe9c96bf73996f841 (diff) | |
| parent | e96406eda4f143f101bd44372f7b2d542183000a (diff) | |
| download | ffmpeg-8d0b2aae71f01904e4a7ac0e8795592da5a0bd89.tar.gz | |
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
rtsp: Add support for depacketizing RTP data via custom IO
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 3a5ad7117f..7ca8f64569 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -42,6 +42,10 @@ enum RTSPLowerTransport { RTSP_LOWER_TRANSPORT_HTTP = 8, /**< HTTP tunneled - not a proper transport mode as such, only for use via AVOptions */ + RTSP_LOWER_TRANSPORT_CUSTOM = 16, /**< Custom IO - not a public + option for lower_transport_mask, + but set in the SDP demuxer based + on a flag. */ }; /** @@ -396,6 +400,7 @@ typedef struct RTSPState { receive packets only from the right source address and port. */ #define RTSP_FLAG_LISTEN 0x2 /**< Wait for incoming connections. */ +#define RTSP_FLAG_CUSTOM_IO 0x4 /**< Do all IO via the AVIOContext. */ /** * Describe a single stream, as identified by a single m= line block in the |