rtsp: Free the rtpdec context properly

Message ID 1345231399-69323-1-git-send-email-martin@martin.st
State Committed
Commit 125c6c07525a7153957d70a1bb5b732f113d1480
Headers show

Commit Message

Martin Storsjö Aug. 17, 2012, 7:23 p.m.
The condition for calling the rtpdec cleanup was broken in
df8cf076c86.
---
 libavformat/rtsp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Storsjö Aug. 27, 2012, 9:30 a.m. | #1
On Fri, 17 Aug 2012, Martin Storsjö wrote:

> The condition for calling the rtpdec cleanup was broken in
> df8cf076c86.
> ---
> libavformat/rtsp.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index ce18610..0390862 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;
> -- 
> 1.7.9.4

OK'd by Kostya and Luca on irc, pushed.

// Martin

Patch

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index ce18610..0390862 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;