diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-05 22:17:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-05 22:17:02 +0200 |
| commit | b4780d03d04d402b490be21b01ec886565cabe29 (patch) | |
| tree | 2c5605baa7b588cced8f79c2916eb724356d5c25 /libavcodec | |
| parent | 69aeba1396d5a13e79cbc3cc9f49fd6896addb82 (diff) | |
| parent | 2096857551660649dbe9a5aad7338b0872858575 (diff) | |
| download | ffmpeg-b4780d03d04d402b490be21b01ec886565cabe29.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
rational: add av_inv_q() returning the inverse of an AVRational
dpx: Make start offset unsigned
lavfi: properly signal out-of-memory error in ff_filter_samples
cosmetics: Fix a few switched periods and linebreaks
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dpx.c | 3 | ||||
| -rw-r--r-- | libavcodec/x86/h264_idct.asm | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 6ef2db2299..791e66af7b 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -62,7 +62,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *const p = &s->picture; uint8_t *ptr; - int magic_num, offset, endian; + unsigned int offset; + int magic_num, endian; int x, y; int w, h, stride, bits_per_color, descriptor, elements, target_packet_size, source_packet_size; diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index da045f71e2..edd603b793 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -704,7 +704,7 @@ h264_idct_dc_add8_mmx2: ALIGN 16 INIT_XMM ; r0 = uint8_t *dst (clobbered), r2 = int16_t *block, r3 = int stride -x264_add8x4_idct_sse2: +h264_add8x4_idct_sse2: movq m0, [r2+ 0] movq m1, [r2+ 8] movq m2, [r2+16] @@ -733,7 +733,7 @@ x264_add8x4_idct_sse2: %else add r0, r0m %endif - call x264_add8x4_idct_sse2 + call h264_add8x4_idct_sse2 .cycle%1end %if %1 < 7 add r2, 64 @@ -768,7 +768,7 @@ cglobal h264_idct_add16_8_sse2, 5, 5 + ARCH_X86_64, 8 %else add r0, r0m %endif - call x264_add8x4_idct_sse2 + call h264_add8x4_idct_sse2 jmp .cycle%1end .try%1dc movsx r0, word [r2 ] @@ -815,7 +815,7 @@ cglobal h264_idct_add16intra_8_sse2, 5, 7 + ARCH_X86_64, 8 mov r0, [r0] add r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))] %endif - call x264_add8x4_idct_sse2 + call h264_add8x4_idct_sse2 jmp .cycle%1end .try%1dc movsx r0, word [r2 ] |