Revert "avformat/rtpdec_rfc4175: Fix incorrect copy_offset calculation"
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 6 Aug 2019 08:35:38 +0000 (10:35 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 6 Aug 2019 08:37:41 +0000 (10:37 +0200)
Reverted at the request of the Author due to potential regression with SMPTE 2110-20

This reverts commit 9051092e73666e95986eb2d596cc0867aea05c3d.

libavformat/rtpdec_rfc4175.c

index 490db87..e9c62c1 100644 (file)
@@ -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;