diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 23:39:27 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 05:43:39 +0300 |
| commit | 7050d07562c0f40033f3766022527afa5eaa5299 (patch) | |
| tree | 50a22bc8b9305f5028edbf31f244b2bcc4b95848 | |
| parent | 19cef664fed6c7c9af42fa88e364b6fcb98f159f (diff) | |
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.
(cherry picked from commit 3e34b7498f14c04baadde1700a6f73a7e9e86fa6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 1eb01911a8..fea3368425 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; } |