diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-20 02:29:43 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-29 13:41:09 +0200 |
| commit | ca8c7591735c0f80cc29e31e2e92cb10228e14c7 (patch) | |
| tree | 68103eff2546f2f880450638cf0048e72f938b34 /libavcodec/intrax8.c | |
| parent | 6ebd06a9b2508747a135ee4c880d8f612e08932b (diff) | |
intrax8: Remove mpegvideo dependency
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 3d396b8e0a..4d8d5c8456 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -24,7 +24,6 @@ #include "avcodec.h" #include "get_bits.h" #include "idctdsp.h" -#include "mpegvideo.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" @@ -734,8 +733,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, IDCTDSPContext *idsp, int16_t (*block)[64], int block_last_index[12], - int mb_width, int mb_height, - MpegEncContext *const s) + int mb_width, int mb_height) { int ret = x8_vlc_init(); if (ret < 0) @@ -747,7 +745,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, w->mb_height = mb_height; w->block = block; w->block_last_index = block_last_index; - w->s = s; // two rows, 2 blocks per cannon mb w->prediction_table = av_mallocz(w->mb_width * 2 * 2); @@ -777,9 +774,7 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, int dquant, int quant_offset, int loopfilter, int lowdelay) { - MpegEncContext *const s = w->s; int mb_xy; - assert(s); w->gb = gb; w->dquant = dquant; |