diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-05 22:26:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-05 22:26:50 +0200 |
| commit | 2c5a2958e961c25434a54c832a04139525f661da (patch) | |
| tree | 7fba548115bae83f10089b8c9b5ff77ee9f14224 /libavcodec/h264_cabac.c | |
| parent | 3e4b5e68c1589590736fce62c0e677c4632f965b (diff) | |
| parent | 0becb07842b57ea225ddf0726de33b5f8e669297 (diff) | |
| download | ffmpeg-2c5a2958e961c25434a54c832a04139525f661da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Factorize declaration of mb_sizes array.
vsrc_buffer: when no frame is available, return an error instead of segfaulting.
configure: add dl to frei0r extralibs.
dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
vp8dsp x86: perform rounding shift with a single instruction
fate: add BMP tests.
swscale: handle complete dimensions for monoblack/white.
aacenc: Mark deinterleave_input_samples argument as const.
vf_unsharp: Mark readonly variable as const.
h264: fix 4:2:2 PCM-macroblocks decoding
Conflicts:
configure
libavcodec/h264.h
libavcodec/x86/dsputil_mmx.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2c83348a5f..65f2cb4dc8 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1984,8 +1984,8 @@ decode_intra_mb: h->slice_table[ mb_xy ]= h->slice_num; if(IS_INTRA_PCM(mb_type)) { - static const uint16_t mb_sizes[4] = {256,384,512,768}; - const int mb_size = mb_sizes[h->sps.chroma_format_idc]*h->sps.bit_depth_luma >> 3; + const int mb_size = ff_h264_mb_sizes[h->sps.chroma_format_idc] * + h->sps.bit_depth_luma >> 3; const uint8_t *ptr; // We assume these blocks are very rare so we do not optimize it. |