diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:46:04 +0200 |
| commit | d303e0affd9274381a098da55ef4eca954f23b74 (patch) | |
| tree | 00a54bf98aa0c13c3689ec694b07e50a21102951 /libavformat/rtsp.h | |
| parent | 257f274dfa000ae0add4aef8bd11375c8d32add0 (diff) | |
| parent | 3e9409b1d0ca6ee7063fa04d940af36a20b46a8b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 469cd21cc9..3d0345d35c 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -220,9 +220,6 @@ typedef struct RTSPState { * see rtsp_read_play() and rtsp_read_seek(). */ int64_t seek_timestamp; - /* XXX: currently we use unbuffered input */ - // AVIOContext rtsp_gb; - int seq; /**< RTSP command sequence number */ /** copy of RTSPMessageHeader->session_id, i.e. the server-provided session |