diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:41:27 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:41:27 +0100 |
| commit | e811ebcd9cd5223239d72c07c79d63ec51ac3259 (patch) | |
| tree | bfba538af222921c0e0e760cad1be5d7a8d142b0 /libavcodec/intrax8.c | |
| parent | f2c78128395e899b5b1eebe2426ca55d577363f0 (diff) | |
| parent | ca8c7591735c0f80cc29e31e2e92cb10228e14c7 (diff) | |
| download | ffmpeg-e811ebcd9cd5223239d72c07c79d63ec51ac3259.tar.gz | |
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 9634a265ea..9af6d1e026 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -25,7 +25,6 @@ #include "avcodec.h" #include "get_bits.h" #include "idctdsp.h" -#include "mpegvideo.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" @@ -730,8 +729,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) @@ -743,7 +741,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); @@ -778,7 +775,6 @@ 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; w->gb = gb; |