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.h | |
| parent | 6ebd06a9b2508747a135ee4c880d8f612e08932b (diff) | |
intrax8: Remove mpegvideo dependency
Diffstat (limited to 'libavcodec/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index ebc9a79a30..ad172b16be 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -21,7 +21,6 @@ #include "blockdsp.h" #include "get_bits.h" -#include "mpegvideo.h" #include "idctdsp.h" #include "intrax8dsp.h" #include "mpegpicture.h" @@ -41,7 +40,6 @@ typedef struct IntraX8Context { int16_t (*block)[64]; // set by the caller codec - MpegEncContext *s; IntraX8DSPContext dsp; IDCTDSPContext idsp; BlockDSPContext bdsp; @@ -75,7 +73,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 @@ -83,15 +80,13 @@ typedef struct IntraX8Context { * @param block_last_index pointer to index array * @param mb_width macroblock width * @param mb_height macroblock height - * @param s pointer to MpegEncContext of the parent codec * @return 0 on success, a negative AVERROR value on error */ 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); /** * Destroy IntraX8 frame structure. @@ -101,9 +96,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 |