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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/intrax8.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index a28c7cafec..5b8946ea25 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 "wmv2dsp.h" @@ -43,8 +42,7 @@ typedef struct IntraX8Context { int *block_last_index; ///< last nonzero coefficient in block int16_t (*block)[64]; - //set by the caller codec - MpegEncContext * s; + // set by the caller codec 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 @@ -86,15 +83,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. @@ -104,9 +99,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(). * lowres decoding is theoretically impossible. * @param w pointer to IntraX8Context * @param pict the output Picture containing an AVFrame |