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

Merge commit '159323897f545e7405fb9db234e0ba123e174376'

Browse Source 
* commit '159323897f545e7405fb9db234e0ba123e174376':
  intrax8: Add a local BlockDSPContext and initialize it

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-24 12:36:23 +01:00
commit 896fce8509
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2261,7 +2261,7 @@ faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp" faanidct_deps="faan idctdsp"
h264dsp_select="startcode" h264dsp_select="startcode"
frame_thread_encoder_deps="encoders threads" frame_thread_encoder_deps="encoders threads"
intrax8_select="idctdsp" intrax8_select="blockdsp idctdsp"
mdct_select="fft" mdct_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp" me_cmp_select="fdctdsp idctdsp pixblockdsp"
mpeg_er_select="error_resilience" mpeg_er_select="error_resilience"

3
libavcodec/intrax8.c
View File

@ -583,7 +583,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
int sign; int sign;
av_assert2(w->orient < 12); av_assert2(w->orient < 12);
s->bdsp.clear_block(s->block[0]); w->bdsp.clear_block(s->block[0]);
if (chroma) if (chroma)
dc_mode = 2; dc_mode = 2;
@ -763,6 +763,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
ff_wmv1_scantable[3]); ff_wmv1_scantable[3]);
ff_intrax8dsp_init(&w->dsp); ff_intrax8dsp_init(&w->dsp);
ff_blockdsp_init(&w->bdsp, avctx);
return 0; return 0;
} }

2
libavcodec/intrax8.h
View File

@ -19,6 +19,7 @@
#ifndef AVCODEC_INTRAX8_H #ifndef AVCODEC_INTRAX8_H
#define AVCODEC_INTRAX8_H #define AVCODEC_INTRAX8_H
#include "blockdsp.h"
#include "get_bits.h" #include "get_bits.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "idctdsp.h" #include "idctdsp.h"
@ -44,6 +45,7 @@ typedef struct IntraX8Context {
MpegEncContext * s; MpegEncContext * s;
IntraX8DSPContext dsp; IntraX8DSPContext dsp;
IDCTDSPContext idsp; IDCTDSPContext idsp;
BlockDSPContext bdsp;
int quant; int quant;
int dquant; int dquant;
int qsum; int qsum;