diff mbox series

[FFmpeg-devel,20/30] avcodec/mpegvideo_enc: Don't merge decoder-only fields

Message ID AM7PR03MB6660CE41D599B5B0E38A6BA98F7E9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 2d2aa5c38443b9d6b4767679913f0964c32a28f9
Headers show
Series [FFmpeg-devel,01/14] avcodec/mjpegenc: Use custom close function directly | 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 fail Make fate failed

Commit Message

Andreas Rheinhardt Dec. 23, 2021, 9:13 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
How could this ever happen? And why did it go unnoticed for so long?
(Btw: skip_count is nearly unused: It is only used to write its value
to the file in case this is the first pass of a two-pass encoding;
said value is read in the second pass, but not used.)

 libavcodec/mpegvideo_enc.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 0c98629603..0279816d3c 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -3404,8 +3404,6 @@  static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src)
     MERGE(b_count);
     MERGE(skip_count);
     MERGE(misc_bits);
-    MERGE(er.error_count);
-    MERGE(padding_bug_score);
     MERGE(current_picture.encoding_error[0]);
     MERGE(current_picture.encoding_error[1]);
     MERGE(current_picture.encoding_error[2]);