---
libavcodec/intrax8.c | 7 +------
libavcodec/intrax8.h | 10 +---------
libavcodec/vc1dec.c | 3 +--
libavcodec/wmv2dec.c | 2 +-
4 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 9c82ef9..c289dd4 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -25,7 +25,6 @@
#include "error_resilience.h"
#include "get_bits.h"
#include "idctdsp.h"
-#include "mpegvideo.h"
#include "msmpeg4data.h"
#include "intrax8huf.h"
#include "intrax8.h"
@@ -727,8 +726,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
ERContext *er, 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);
@@ -774,10 +771,8 @@ 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;
int alloc_size = FFALIGN(FFABS(pict->f->linesize[0]) + 32, 32) * 2 * 24;
- assert(s);
w->gb = gb;
w->dquant = dquant;
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index d4d9c71..bb8e97d 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -22,7 +22,6 @@
#include "blockdsp.h"
#include "get_bits.h"
#include "error_resilience.h"
-#include "mpegvideo.h"
#include "idctdsp.h"
#include "intrax8dsp.h"
#include "mpegpicture.h"
@@ -42,7 +41,6 @@ typedef struct IntraX8Context {
int16_t (*block)[64];
// set by the caller codec
- MpegEncContext *s;
IntraX8DSPContext dsp;
IDCTDSPContext idsp;
BlockDSPContext bdsp;
@@ -78,7 +76,6 @@ typedef struct IntraX8Context {
/**
* Initialize IntraX8 frame decoder.
- * Requires valid MpegEncContext with valid s->mb_width before calling.
* @param avctx pointer to AVCodecContext
* @param w pointer to IntraX8Context
* @param idsp pointer to IDCTDSPContext
@@ -87,15 +84,13 @@ typedef struct IntraX8Context {
* @param block_last_index pointer to the array of indexes
* @param mb_width macroblock width
* @param mb_height macroblock height
- * @param s pointer to MpegEncContext of the parent codec
* @return 0 on success, < 0 on error
*/
int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
ERContext *er, int16_t (*block)[64],
int block_last_index[12],
- int mb_width, int mb_height,
- MpegEncContext *const s);
+ int mb_width, int mb_height);
/**
* Destroy IntraX8 frame structure.
@@ -105,9 +100,6 @@ void ff_intrax8_common_end(IntraX8Context *w);
/**
* Decode single IntraX8 frame.
- * The parent codec must call ff_mpv_frame_start() before calling this
function.
- * The parent codec must call ff_mpv_frame_end() after calling this function.
- * This function does not use ff_mpv_decode_mb().
* @param w pointer to IntraX8Context
* @param pict the output Picture containing an AVFrame
* @param gb open bitstream reader
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index ec65d58..c938b60 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -362,8 +362,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, &s->er,
s->block, s->block_last_index,
- s->mb_width, s->mb_height,
- s);
+ s->mb_width, s->mb_height);
if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id ==
AV_CODEC_ID_VC1IMAGE) {
for (i = 0; i < 4; i++)
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 0a04b04..bcefa8c 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -471,7 +471,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, &w->s.er,
w->s.block, w->s.block_last_index,
- w->s.mb_width, w->s.mb_height, &w->s);
+ w->s.mb_width, w->s.mb_height);
}
static av_cold int wmv2_decode_end(AVCodecContext *avctx)
--
2.7.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
