ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Jun 3 22:39:27 2015 +0200| [3e34b7498f14c04baadde1700a6f73a7e9e86fa6] | committer: Michael Niedermayer
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. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e34b7498f14c04baadde1700a6f73a7e9e86fa6 --- libavformat/rtpenc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index d09b22f..31569d6 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; } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
