diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 22:39:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 02:33:56 +0200 |
| commit | 1728aa3442d7e3a18268a9b8ae8fcb5ff914fa33 (patch) | |
| tree | 8252de7579747f1f200d006afc06283453e6c8fc /libavformat/rtpenc.c | |
| parent | f569422d669ff2232e52ee4345eea0742d37c67c (diff) | |
| download | ffmpeg-1728aa3442d7e3a18268a9b8ae8fcb5ff914fa33.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.
(cherry picked from commit 3e34b7498f14c04baadde1700a6f73a7e9e86fa6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -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 c608dfb46a..cbe0faea48 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -576,10 +576,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; } |