virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avcodec/mpeg12: Remove duplicate block_last_index setting code

Browse Source 
Based on 7c25ffe070 and 58dd885f9a

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-02-16 21:36:29 +01:00
parent 5c02c95f2c
commit 2e8ad2d65a
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/eatqi.c
View File

@@ -51,7 +51,6 @@ typedef struct TqiContext {
int last_dc[3];
DECLARE_ALIGNED(16, int16_t, block)[6][64];
int block_last_index[12];
} TqiContext;
static av_cold int tqi_decode_init(AVCodecContext *avctx)
@@ -79,7 +78,7 @@ static int tqi_decode_mb(TqiContext *t, int16_t (*block)[64])
int ret = ff_mpeg1_decode_block_intra(&t->gb,
t->intra_matrix,
t->intra_scantable.permutated,
t->last_dc, block[n], n, 1, t->block_last_index);
t->last_dc, block[n], n, 1);
if (ret < 0)
return -1;
}

8
libavcodec/mpeg12.c
View File

@@ -248,8 +248,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size,
int ff_mpeg1_decode_block_intra(GetBitContext *gb,
const uint16_t *quant_matrix,
uint8_t *const scantable, int last_dc[3],
int16_t *block, int index, int qscale,
int block_last_index[12])
int16_t *block, int index, int qscale)
{
int dc, diff, i = 0, component;
RLTable *rl = &ff_rl_mpeg1;
@@ -335,8 +334,7 @@ end:
}
if (i > MAX_INDEX)
return AVERROR_INVALIDDATA;
i = AVERROR_INVALIDDATA;
block_last_index[index] = i;
return 0;
return i;
}

3
libavcodec/mpeg12.h
View File

@@ -53,8 +53,7 @@ static inline int decode_dc(GetBitContext *gb, int component)
int ff_mpeg1_decode_block_intra(GetBitContext *gb,
const uint16_t *quant_matrix,
uint8_t *const scantable, int last_dc[3],
int16_t *block, int index, int qscale,
int block_last_index[12]);
int16_t *block, int index, int qscale);
void ff_mpeg1_clean_buffers(MpegEncContext *s);
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s);

2
libavcodec/mpeg12dec.c
View File

@@ -792,7 +792,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
s->intra_matrix,
s->intra_scantable.permutated,
s->last_dc, *s->pblocks[i],
i, s->qscale, s->block_last_index);
i, s->qscale);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",
s->mb_x, s->mb_y);