[FFmpeg-cvslog] Revert "avformat/rtpdec_rfc4175: Fix incorrect copy_offset calculation"

Michael Niedermayer git at videolan.org
Tue Aug 6 11:44:11 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Aug  6 10:35:38 2019 +0200| [6c67c8ca9ae603b91e65274f93099ccb07bb33db] | committer: Michael Niedermayer

Revert "avformat/rtpdec_rfc4175: Fix incorrect copy_offset calculation"

Reverted at the request of the Author due to potential regression with SMPTE 2110-20

This reverts commit 9051092e73666e95986eb2d596cc0867aea05c3d.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c67c8ca9ae603b91e65274f93099ccb07bb33db
---

 libavformat/rtpdec_rfc4175.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c
index 490db87520..e9c62c1389 100644
--- a/libavformat/rtpdec_rfc4175.c
+++ b/libavformat/rtpdec_rfc4175.c
@@ -205,11 +205,8 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data,
         if (length > payload_len)
             length = payload_len;
 
-        if (line < 1)
-            return AVERROR_INVALIDDATA;
-
         /* prevent ill-formed packets to write after buffer's end */
-        copy_offset = ((line - 1) * data->width + offset) * data->pgroup / data->xinc;
+        copy_offset = (line * data->width + offset) * data->pgroup / data->xinc;
         if (copy_offset + length > data->frame_size)
             return AVERROR_INVALIDDATA;
 



More information about the ffmpeg-cvslog mailing list