diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:41:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:54:38 +0200 |
commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/h263.h | |
parent | ab12373956e92b865bced9b05b12971f062cfd3e (diff) | |
parent | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff) | |
download | ffmpeg-2b05db4f8102148d013755ac2a7e47f6d79ff7ca.tar.gz |
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
dsputil: Split clear_block*/fill_block* off into a separate context
Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263.h')
-rw-r--r-- | libavcodec/h263.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 962d44cbb6..54ce2a5f97 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -196,7 +196,7 @@ static inline int get_p_cbp(MpegEncContext * s, for (i = 0; i < 6; i++) { if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){ s->block_last_index[i]= -1; - s->dsp.clear_block(s->block[i]); + s->bdsp.clear_block(s->block[i]); } } }else{ |