diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-16 21:36:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-16 21:47:56 +0100 |
| commit | 2e8ad2d65af575de2baca3b97dd646827bd4a0bc (patch) | |
| tree | 524c7bed1e67b506c3bb874be8ec860526db4b72 /libavcodec/mpeg12.c | |
| parent | 5c02c95f2c2a9302446b8abdad6ca2c0f1d1e821 (diff) | |
| download | ffmpeg-2e8ad2d65af575de2baca3b97dd646827bd4a0bc.tar.gz | |
avcodec/mpeg12: Remove duplicate block_last_index setting code
Based on 7c25ffe070c286874a8c3513f7504b90e1626b0c and 58dd885f9ae7feee002773253e345e11e7142739
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d92d24a836..7c140529ec 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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; } |