[libav-commits] rtp: Make sure the output format pointer is set

Martin Storsjö git at libav.org
Thu Jan 24 11:06:01 CET 2013


Module: libav
Branch: release/9
Commit: 348cd84fc82eadd3ad81ed84b1ca7b88dcc0ccb2

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Wed Jan 23 23:21:52 2013 +0200

rtp: Make sure the output format pointer is set

Not sure if this actually happens, but we do the same check when
checking payload_type further above in the function, so it might
be needed.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 932117171f32fc3160f3d92943290238945fcb28)

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/rtp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 9a7d44b..eab8271 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -107,7 +107,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
     /* static payload type */
     for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i)
         if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) {
-            if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt ||
+            if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || !fmt->oformat ||
                 !fmt->oformat->priv_class || !fmt->priv_data ||
                 !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190")))
                 continue;



More information about the libav-commits mailing list