diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:03:17 +0200 |
| commit | b97b4b58a6e1ac595002b3e3f3469161771c6003 (patch) | |
| tree | 8c2833931fb16084f95bf0adf8317e1fa28aca12 /libavformat/rtpproto.c | |
| parent | 67d441499a042edcfb0f8a120e6196d10b1d13db (diff) | |
| parent | a88ef93b4abbea9f18c8750113dc9e99931f2f8a (diff) | |
| download | ffmpeg-b97b4b58a6e1ac595002b3e3f3469161771c6003.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpproto.c')
| -rw-r--r-- | libavformat/rtpproto.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index e822ed71d5..8b23f25c46 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -138,15 +138,13 @@ static int rtp_open(URLContext *h, const char *uri, int flags) { RTPContext *s; int rtp_port, rtcp_port, - is_output, ttl, connect, + ttl, connect, local_rtp_port, local_rtcp_port, max_packet_size; char hostname[256]; char buf[1024]; char path[1024]; const char *p; - is_output = (flags & AVIO_FLAG_WRITE); - s = av_mallocz(sizeof(RTPContext)); if (!s) return AVERROR(ENOMEM); |