aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-03 22:39:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-03 22:39:27 +0200
commit3e34b7498f14c04baadde1700a6f73a7e9e86fa6 (patch)
treed9a402c0d7fa6ff111042e048ed776d27f03297b
parentaef34ab95048aade062d4c669ea272e0f08b81a4 (diff)
downloadffmpeg-3e34b7498f14c04baadde1700a6f73a7e9e86fa6.tar.gz
Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference"
This was simply wrong Found-by: Martin Storsjö This reverts commit 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0.
-rw-r--r--libavformat/rtpenc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index d09b22f9f8..31569d60b7 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;
}