MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged 

Always zero since 4d2858deac.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-01-10 11:04:28 +01:00
parent 75a3268bee
commit 42d30c9019
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h263dec.c
View File

@ -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;

1
libavcodec/mpegvideo.h
View File

@ -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;

1
libavcodec/mpegvideo_dec.c
View File

@ -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;

8
libavcodec/svq3.c
View File

@ -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;

7
libavcodec/vc1dec.c
View File

@ -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;
}