aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bfin
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-16 00:55:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-16 00:56:15 +0200
commitd98c3adef2efadfa0c8cd923b932646f66800614 (patch)
tree35e879c7af98709402b23d698e9a7860795f4716 /libavcodec/bfin
parent05bea443935a64c720b9de845b3dd9717bce618e (diff)
parent015821229f96bf7e677f2a711a58dbea3009f574 (diff)
downloadandroid_external_ffmpeg-d98c3adef2efadfa0c8cd923b932646f66800614.tar.gz
android_external_ffmpeg-d98c3adef2efadfa0c8cd923b932646f66800614.tar.bz2
android_external_ffmpeg-d98c3adef2efadfa0c8cd923b932646f66800614.zip
Merge commit '015821229f96bf7e677f2a711a58dbea3009f574'
* commit '015821229f96bf7e677f2a711a58dbea3009f574': vp3: Use full transpose for all IDCTs Conflicts: libavcodec/vp3.c libavcodec/vp3dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r--libavcodec/bfin/vp3_bfin.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c
index 5cd9a97259..868c431492 100644
--- a/libavcodec/bfin/vp3_bfin.c
+++ b/libavcodec/bfin/vp3_bfin.c
@@ -61,6 +61,5 @@ av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags)
if (!(flags & CODEC_FLAG_BITEXACT)) {
c->idct_add = bfin_vp3_idct_add;
c->idct_put = bfin_vp3_idct_put;
- c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
}
}