generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'

Browse Source 
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-07 21:41:27 +01:00
commit e811ebcd9c
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/intrax8.c
View File

@ -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;

12
libavcodec/intrax8.h
View File

@ -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

3
libavcodec/vc1dec.c
View File

@ -389,8 +389,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,
s->block, s->block_last_index,
s->mb_width, s->mb_height,
s);
s->mb_width, s->mb_height);
if (ret < 0)
goto error;

2
libavcodec/wmv2dec.c
View File

@ -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.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)