From 3e34b7498f14c04baadde1700a6f73a7e9e86fa6 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Jun 2015 22:39:27 +0200
Subject: [PATCH] Revert "avformat/rtpenc: check av_packet_get_side_data()
return, fix null ptr dereference"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This was simply wrong
Found-by: Martin Storsjö
This reverts commit 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0.
---
libavformat/rtpenc.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index d09b22f9f85..31569d60b7c 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -561,10 +561,6 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
const uint8_t *mb_info =
av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO,
&mb_info_size);
- if (!mb_info) {
- av_log(s1, AV_LOG_ERROR, "failed to allocate side data\n");
- return AVERROR(ENOMEM);
- }
ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size);
break;
}
--
GitLab