aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-10 11:04:28 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-13 08:25:10 +0100
commit42d30c9019a6b67c56b05f1828fa04c0439a4fd0 (patch)
tree6da5ad5f835f80153fb8ac3fb08a70b19ede88da
parent75a3268beea691c73c8bb202a2d4a6d61a97234a (diff)
downloadffmpeg-42d30c9019a6b67c56b05f1828fa04c0439a4fd0.tar.gz
avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged
Always zero since 4d2858deac5213eaddfdc06f98379b6325d7b953. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/h263dec.c7
-rw-r--r--libavcodec/mpegvideo.h1
-rw-r--r--libavcodec/mpegvideo_dec.c1
-rw-r--r--libavcodec/svq3.c8
-rw-r--r--libavcodec/vc1dec.c7
5 files changed, 0 insertions, 24 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 11e80cb9e9..9cc2665cac 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -603,13 +603,6 @@ retry:
avctx->skip_frame >= AVDISCARD_ALL)
return get_consumed_bytes(s, buf_size);
- if (s->next_p_frame_damaged) {
- if (s->pict_type == AV_PICTURE_TYPE_B)
- return get_consumed_bytes(s, buf_size);
- else
- s->next_p_frame_damaged = 0;
- }
-
if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
s->me.qpel_put = s->qdsp.put_qpel_pixels_tab;
s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 1c14f5b0f0..448fe2cedc 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -342,7 +342,6 @@ typedef struct MpegEncContext {
int resync_mb_y; ///< y position of last resync marker
GetBitContext last_resync_gb; ///< used to search for the next resync marker
int mb_num_left; ///< number of MBs left in this video packet (for partitioned Slices only)
- int next_p_frame_damaged; ///< set if the next p frame is damaged, to avoid showing trashed B-frames
#if FF_API_FLAG_TRUNCATED
ParseContext parse_context;
diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c
index 8b625d2835..1e238bd1e1 100644
--- a/libavcodec/mpegvideo_dec.c
+++ b/libavcodec/mpegvideo_dec.c
@@ -132,7 +132,6 @@ do {\
s->next_picture_ptr = REBASE_PICTURE(s1->next_picture_ptr, s, s1);
// Error/bug resilience
- s->next_p_frame_damaged = s1->next_p_frame_damaged;
s->workaround_bugs = s1->workaround_bugs;
s->padding_bug_score = s1->padding_bug_score;
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index e329578af0..6f3ade8ace 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -98,7 +98,6 @@ typedef struct SVQ3Context {
int has_watermark;
uint32_t watermark_key;
int adaptive_quant;
- int next_p_frame_damaged;
int h_edge_pos;
int v_edge_pos;
int last_frame_output;
@@ -1470,13 +1469,6 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
avctx->skip_frame >= AVDISCARD_ALL)
return 0;
- if (s->next_p_frame_damaged) {
- if (s->pict_type == AV_PICTURE_TYPE_B)
- return 0;
- else
- s->next_p_frame_damaged = 0;
- }
-
if (s->pict_type == AV_PICTURE_TYPE_B) {
s->frame_num_offset = s->slice_num - s->prev_frame_num;
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 267d72d15b..7ed5133cfa 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -872,13 +872,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
goto end;
}
- if (s->next_p_frame_damaged) {
- if (s->pict_type == AV_PICTURE_TYPE_B)
- goto end;
- else
- s->next_p_frame_damaged = 0;
- }
-
if ((ret = ff_mpv_frame_start(s, avctx)) < 0) {
goto err;
}