diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
| commit | 7fad19a63dc52db4bf2bebbd9d261675956b1b34 (patch) | |
| tree | 8997428f45d54f3177dc6cd208d0375daa6fe201 /libavcodec/h264pred_template.c | |
| parent | 16abd687798bbf9192ba4954765e61de96065b8b (diff) | |
| parent | 599b4c6efddaed33b1667c386b34b07729ba732b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: cabac: replace explicit memory references with "m" operands
avplay: don't request a stereo downmix
wmapro: use av_float2int()
lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
lavu: replace int/float punning functions
lavfi: install libavfilter/vsrc_buffer.h
Remove extraneous semicolons
sdp: Restore the original mp4 format h264 extradata if converted
rtpenc: Add support for mp4 format h264
rtpenc: Simplify code by introducing a separate end pointer
movenc: Use the actual converted sample for RTP hinting
Fix a bunch of common typos.
Conflicts:
doc/developer.texi
doc/eval.texi
doc/filters.texi
doc/protocols.texi
ffmpeg.c
ffplay.c
libavcodec/mpegvideo.h
libavcodec/x86/cabac.h
libavfilter/Makefile
libavformat/avformat.h
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/gxfenc.c
libavformat/img2.c
libavformat/movenc.c
libavformat/mpegts.c
libavformat/rtpenc_h264.c
libavformat/utils.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred_template.c')
| -rw-r--r-- | libavcodec/h264pred_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c index 074fad50ca..3a1b1cf94e 100644 --- a/libavcodec/h264pred_template.c +++ b/libavcodec/h264pred_template.c @@ -388,9 +388,9 @@ static void FUNCC(pred16x16_##n##_dc)(uint8_t *_src, int stride){\ PREDICT_16x16_DC(PIXEL_SPLAT_X4(v));\ } -PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1); -PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0); -PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1); +PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1) +PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0) +PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1) static inline void FUNCC(pred16x16_plane_compat)(uint8_t *p_src, int p_stride, const int svq3, const int rv40){ int i, j, k; @@ -502,9 +502,9 @@ static void FUNCC(pred8x8_##n##_dc)(uint8_t *_src, int stride){\ }\ } -PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1); -PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0); -PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1); +PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1) +PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0) +PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1) static void FUNCC(pred8x16_128_dc)(uint8_t *_src, int stride){ FUNCC(pred8x8_128_dc)(_src, stride); |