diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-01-25 12:56:11 -0500 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-02-09 20:04:59 +0100 |
| commit | 7c25ffe070c286874a8c3513f7504b90e1626b0c (patch) | |
| tree | 8532cb662850f35681472362c3a1eab3fa597d77 /libavcodec/eatqi.c | |
| parent | 249827f736db4c94dfcb24a3883aa4c04f9b119b (diff) | |
| download | ffmpeg-7c25ffe070c286874a8c3513f7504b90e1626b0c.tar.gz | |
mpeg1: Make intra-block decoding independent of MpegEncContext
This allows untangling the eatqi decoder from the MPEG-1 decoder.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/eatqi.c')
| -rw-r--r-- | libavcodec/eatqi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index f5dcb53692..59bba9748f 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -66,9 +66,14 @@ static int tqi_decode_mb(MpegEncContext *s, int16_t (*block)[64]) { int n; s->bdsp.clear_blocks(block[0]); - for (n=0; n<6; n++) - if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0) + for (n = 0; n < 6; n++) { + int ret = ff_mpeg1_decode_block_intra(&s->gb, + s->intra_matrix, + s->intra_scantable.permutated, + s->last_dc, block[n], n, 1); + if (ret < 0) return -1; + } return 0; } |