diff options
| author | Martin Storsjö <martin@martin.st> | 2013-01-23 23:21:52 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-24 11:57:29 +0200 |
| commit | 348cd84fc82eadd3ad81ed84b1ca7b88dcc0ccb2 (patch) | |
| tree | 276ec198a240abda8dfc7af413486cf63c63e0b7 | |
| parent | 62de693a17f9b107be7867d822d5accacd4be544 (diff) | |
| download | ffmpeg-348cd84fc82eadd3ad81ed84b1ca7b88dcc0ccb2.tar.gz | |
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@martin.st>
(cherry picked from commit 932117171f32fc3160f3d92943290238945fcb28)
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 9a7d44b0b4..eab8271c4f 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; |