diff options
| author | Michael Niedermayer | 2012-10-19 13:58:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-10-19 13:58:14 +0200 |
| commit | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (patch) | |
| tree | 862e934366547cb8723d94f7f30953cb20d549b8 /libavformat/rtsp.h | |
| parent | 93f244e3abc3d75a797535a8da890bb1f9932433 (diff) | |
| parent | 1cd432e167b1a80853760c89a33606e2b5f229c2 (diff) | |
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index e55073c430..176fef7ee2 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -385,12 +385,17 @@ typedef struct RTSPState { * Timeout to wait for incoming connections. */ int initial_timeout; + + /** + * Size of RTP packet reordering queue. + */ + int reordering_queue_size; } RTSPState; #define RTSP_FLAG_FILTER_SRC 0x1 /**< Filter incoming UDP packets - receive packets only from the right source address and port. */ -#define RTSP_FLAG_LISTEN 0x2 /**< Wait for incoming connections. */ +#define RTSP_FLAG_LISTEN 0x2 /**< Wait for incoming connections. */ /** * Describe a single stream, as identified by a single m= line block in the |