diff mbox series

[FFmpeg-devel,2/3] avcodec/libx264: Remove always-false checks

Message ID AM7PR03MB66600E59F97DF2690A20EE7C8F909@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 19ed9236db8796104c5a4f3343596172b01ebd1b
Headers show
Series [FFmpeg-devel,1/3] avcodec/libx264: Check for overflow if necessary | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Nov. 7, 2021, 2:36 p.m. UTC 
Always false since this encoder was switched to encode2 and
ff_alloc_packet() in 06484d0b8a7d4d1a694ba7ab277e2ec32d6558d7
and f2b20b7a8b6fcbcd8cc669f5211e4e2ed7d8e9f3.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libx264.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 8711c72131..4fe02dd11c 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -162,11 +162,7 @@  static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
     p = pkt->data;
 
     /* Write the SEI as part of the first frame. */
-    if (x4->sei_size > 0 && nnal > 0) {
-        if (x4->sei_size > size) {
-            av_log(ctx, AV_LOG_ERROR, "Error: nal buffer is too small\n");
-            return -1;
-        }
+    if (x4->sei_size > 0) {
         memcpy(p, x4->sei, x4->sei_size);
         p += x4->sei_size;
         x4->sei_size = 0;