mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-06 15:49:50 +08:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits) ARM: disable ff_vector_fmul_vfp on VFPv3 systems ARM: check for VFPv3 swscale: Remove unused variables in x86 code. doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. x86: Add appropriate ifdefs around certain AVX functions. cmdutils: use sws_freeContext() instead of av_freep(). swscale: delay allocation of formatConvBuffer(). swscale: fix build with --disable-swscale-alpha. movenc: Deprecate the global RTP hinting flag, use a private AVOption instead movenc: Add an AVClass for setting muxer specific options swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. configure: report yasm/nasm presence properly tcp: make connect() timeout properly rawdec: factor video demuxer definitions into a macro. rtspdec: add initial_pause private option. lavf: deprecate AVFormatParameters.width/height. tty: add video_size private option. rawdec: add video_size private option. x11grab: add video_size private option. x11grab: factorize returning error codes. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@ -28,6 +28,8 @@
|
||||
#include "network.h"
|
||||
#include "httpauth.h"
|
||||
|
||||
#include "libavutil/log.h"
|
||||
|
||||
/**
|
||||
* Network layer over which RTP/etc packet data will be transported.
|
||||
*/
|
||||
@ -196,6 +198,7 @@ enum RTSPServerType {
|
||||
* @todo Use AVIOContext instead of URLContext
|
||||
*/
|
||||
typedef struct RTSPState {
|
||||
const AVClass *class; /**< Class for private options. */
|
||||
URLContext *rtsp_hd; /* RTSP TCP connection handle */
|
||||
|
||||
/** number of items in the 'rtsp_streams' variable */
|
||||
@ -336,6 +339,11 @@ typedef struct RTSPState {
|
||||
* Whether the server supports the GET_PARAMETER method.
|
||||
*/
|
||||
int get_parameter_supported;
|
||||
|
||||
/**
|
||||
* Do not begin to play the stream immediately.
|
||||
*/
|
||||
int initial_pause;
|
||||
} RTSPState;
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user