From 535c247b571805709dcd2038d9ee86fe167b4bc1 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sat, 23 Mar 2013 13:12:36 +0100 Subject: [PATCH 1/4] fate: use little endian yuv444p10 in h264-reinit tests Fixes fate big endian configs. --- tests/fate/h264.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index fcecc8f016..74c6a2de30 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -368,4 +368,4 @@ fate-h264-extreme-plane-pred: CMD = framemd5 -i $(SAMPLES)/h fate-h264-interlace-crop: CMD = framecrc -i $(SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 fate-h264-lossless: CMD = framecrc -i $(SAMPLES)/h264/lossless.h264 -fate-h264-reinit-%: CMD = framecrc -i $(SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10,scale=352:288 +fate-h264-reinit-%: CMD = framecrc -i $(SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=352:288 From fe2661121e22fd4aa6a32d17e6160abff00f242c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 23 Mar 2013 22:16:37 +0200 Subject: [PATCH 2/4] bktr: Add missing includes for av_gettime() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is necessary after the old av_gettime in libavformat was dropped. Signed-off-by: Martin Storsjö --- libavdevice/bktr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index d0122d38d6..a147d38953 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -29,6 +29,7 @@ #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" +#include "libavutil/time.h" #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H # include # include From 352dbdb96c4f6cc0fc851eca54c6064e0100e0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 23 Mar 2013 22:12:54 +0200 Subject: [PATCH 3/4] x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/x86/w64xmmtest.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/x86/w64xmmtest.c b/libavcodec/x86/w64xmmtest.c index f6e3de9496..a8b6803daf 100644 --- a/libavcodec/x86/w64xmmtest.c +++ b/libavcodec/x86/w64xmmtest.c @@ -65,13 +65,6 @@ wrap(avcodec_encode_audio2(AVCodecContext *avctx, got_packet_ptr); } -wrap(avcodec_encode_video(AVCodecContext *avctx, - uint8_t *buf, int buf_size, - const AVFrame *pict)) -{ - testxmmclobbers(avcodec_encode_video, avctx, buf, buf_size, pict); -} - wrap(avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, const AVSubtitle *sub)) From 285ff14413718ef70b3d992be24472c12cbc481c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 23 Mar 2013 23:35:19 +0200 Subject: [PATCH 4/4] x86: Change a missed occurrance of int to ptrdiff_t for strides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/x86/h264_qpel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 5b3a287d12..f909825944 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -475,7 +475,7 @@ LUMA_MC_816(10, mc23, sse2) LUMA_MC_816(10, mc33, sse2) #define QPEL16_OPMC(OP, MC, MMX)\ -void ff_ ## OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\ +void ff_ ## OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride){\ ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst , src , stride);\ ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst+16, src+16, stride);\ src += 8*stride;\