diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:18:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:18:29 +0200 |
| commit | 1090f69386abefc0a081dd000ae8187243425f71 (patch) | |
| tree | fd3899e5ef3d2ea37a23b32566a13292fdb7cfe4 | |
| parent | 018cc6f0266a2ca5cae507491aeeb37834a144b7 (diff) | |
| parent | aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5 (diff) | |
| download | ffmpeg-1090f69386abefc0a081dd000ae8187243425f71.tar.gz | |
Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'
* commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5':
bfin: Don't use the vp3 idct functions if bitexact behaviour is expected
Conflicts:
libavcodec/bfin/vp3_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index 366955b58c..7dd5c923d4 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -55,6 +55,8 @@ av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) { // FIXME: these functions are disabled because they expect unpermutated // IDCT coefficients as input, but the coefficients are transposed - //c->idct_add = ff_bfin_vp3_idct_add; - //c->idct_put = ff_bfin_vp3_idct_put; +// if (!(flags & CODEC_FLAG_BITEXACT)) { +// c->idct_add = ff_bfin_vp3_idct_add; +// c->idct_put = ff_bfin_vp3_idct_put; +// } } |