aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-01-23 23:21:52 +0200
committerMartin Storsjö <martin@martin.st>2013-01-24 11:31:35 +0200
commit932117171f32fc3160f3d92943290238945fcb28 (patch)
tree736ceaf52b736415f41b41f06b04c68cf506f27f
parent57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c (diff)
downloadffmpeg-932117171f32fc3160f3d92943290238945fcb28.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>
-rw-r--r--libavformat/rtp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index d1c6ed09aa..e827c2e0ab 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -103,7 +103,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
/* static payload type */
for (i = 0; rtp_payload_types[i].pt >= 0; ++i)
if (rtp_payload_types[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;