generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference"

Browse Source 
This was simply wrong

Found-by: Martin Storsjö
This reverts commit 5d8e4f6da0.
(cherry picked from commit 3e34b7498f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-03 22:39:27 +02:00
committed by Michael Niedermayer
parent f569422d66
commit 1728aa3442
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpenc.c
View File

@@ -576,10 +576,6 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
const uint8_t *mb_info = const uint8_t *mb_info =
av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO, av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO,
&mb_info_size); &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); ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size);
break; break;
} }