aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bfin
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-25 06:46:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-25 12:29:20 +0200
commit2aaf32f52f25ac7b3b18606a00953c0aa8e2e7bd (patch)
tree57760259017c37460e843bc2a35b50856981754b /libavcodec/bfin
parent73a528748296c4b2c807d6610d873f97fe7fc428 (diff)
downloadandroid_external_ffmpeg-2aaf32f52f25ac7b3b18606a00953c0aa8e2e7bd.tar.gz
android_external_ffmpeg-2aaf32f52f25ac7b3b18606a00953c0aa8e2e7bd.tar.bz2
android_external_ffmpeg-2aaf32f52f25ac7b3b18606a00953c0aa8e2e7bd.zip
mpegvideo: support encoding with chroma intra tables that differ from luma.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r--libavcodec/bfin/mpegvideo_bfin.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c
index 0373e22ff8..996290a52d 100644
--- a/libavcodec/bfin/mpegvideo_bfin.c
+++ b/libavcodec/bfin/mpegvideo_bfin.c
@@ -61,8 +61,13 @@ static int dct_quantize_bfin (MpegEncContext *s,
dc = block[0] = (block[0] + (q >> 1)) / q;
start_i = 1;
last_non_zero = 0;
- bias = s->q_intra_matrix16[qscale][1];
- qmat = s->q_intra_matrix16[qscale][0];
+ if(n<4){
+ bias = s->q_intra_matrix16[qscale][1];
+ qmat = s->q_intra_matrix16[qscale][0];
+ }else{
+ bias = s->q_chroma_intra_matrix16[qscale][1];
+ qmat = s->q_chroma_intra_matrix16[qscale][0];
+ }
} else {
start_i = 0;