diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:32:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:32:44 +0200 |
| commit | 4abb88d7e84208d86750091b3ec9082767ca74c1 (patch) | |
| tree | 1bfe6c37efeaee8fda5bdcf2155e5294eba9c8ac /libavformat | |
| parent | 60924dfe5539d1f5ff29240f0995a15c23982b88 (diff) | |
| parent | 2bd67175c7e16c1f5da15c9e55ae6db4ab1d23fd (diff) | |
| download | ffmpeg-4abb88d7e84208d86750091b3ec9082767ca74c1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_hqdn3d: Don't declare the loop variable within the for loop
huffyuv: update to current coding style
huffman: update to current coding style
rtsp: Free the rtpdec context properly
build: fft: x86: Drop unused YASM-OBJS-FFT- variable
Conflicts:
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 35b2724950..d64644d370 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -568,7 +568,7 @@ void ff_rtsp_undo_setup(AVFormatContext *s) avformat_free_context(rtpctx); } else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC) ff_rdt_parse_close(rtsp_st->transport_priv); - else if (rt->transport == RTSP_TRANSPORT_RAW && CONFIG_RTPDEC) + else if (rt->transport == RTSP_TRANSPORT_RTP && CONFIG_RTPDEC) ff_rtp_parse_close(rtsp_st->transport_priv); } rtsp_st->transport_priv = NULL; |