diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2013-05-08 23:47:26 -0700 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2013-05-08 23:47:26 -0700 |
| commit | 06b20663ebf9a59691b6e61e4ac0fa2d46968441 (patch) | |
| tree | 2bcebf9a8d02e2489ed146fc121046262f2a41fc /lib | |
| parent | 37d7b77fb3e7a912ab7a7cc27e72cc19170def1f (diff) | |
| parent | 6bfa7bbd08d9fef5f66c817d964b4a3fc3fe9cc5 (diff) | |
Merge pull request #2699 from FernetMenta/hwaccel
move vdpau into hwaccel
Diffstat (limited to 'lib')
4 files changed, 60 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavcodec/mpeg12.c b/lib/ffmpeg/libavcodec/mpeg12.c index 9d2743a6df..0f947726ee 100644 --- a/lib/ffmpeg/libavcodec/mpeg12.c +++ b/lib/ffmpeg/libavcodec/mpeg12.c @@ -1202,6 +1202,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { #endif #if CONFIG_MPEG1_VDPAU_HWACCEL AV_PIX_FMT_VDPAU_MPEG1, + AV_PIX_FMT_VDPAU, #endif AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE @@ -1214,6 +1215,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { #endif #if CONFIG_MPEG2_VDPAU_HWACCEL AV_PIX_FMT_VDPAU_MPEG2, + AV_PIX_FMT_VDPAU, #endif #if CONFIG_MPEG2_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, diff --git a/lib/ffmpeg/libavcodec/vdpau_vc1.c b/lib/ffmpeg/libavcodec/vdpau_vc1.c index f5da9bbe1f..993ef2614a 100644 --- a/lib/ffmpeg/libavcodec/vdpau_vc1.c +++ b/lib/ffmpeg/libavcodec/vdpau_vc1.c @@ -59,7 +59,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx, else info->picture_type = s->pict_type - 1 + s->pict_type / 3; - info->frame_coding_mode = v->fcm; + info->frame_coding_mode = v->fcm ? v->fcm + 1 : 0; info->postprocflag = v->postprocflag; info->pulldown = v->broadcast; info->interlace = v->interlace; diff --git a/lib/ffmpeg/patches/0036-backport-register-vdpau-hwaccel-for-mpeg12-fe1f36547d0be963e352de0cde1a6cba59ea2e78.patch b/lib/ffmpeg/patches/0036-backport-register-vdpau-hwaccel-for-mpeg12-fe1f36547d0be963e352de0cde1a6cba59ea2e78.patch new file mode 100644 index 0000000000..2f3e39650f --- /dev/null +++ b/lib/ffmpeg/patches/0036-backport-register-vdpau-hwaccel-for-mpeg12-fe1f36547d0be963e352de0cde1a6cba59ea2e78.patch @@ -0,0 +1,32 @@ +From bb6ba57092c402b6f2e5edf6d1691beafafa0460 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker <fernetmenta@online.de> +Date: Mon, 6 May 2013 20:58:28 +0200 +Subject: [PATCH] ffmpeg backport: register vdpau hwaccel for mpeg12 + +--- + libavcodec/mpeg12.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c +index 9d2743a..0f94772 100644 +--- a/libavcodec/mpeg12.c ++++ b/libavcodec/mpeg12.c +@@ -1202,6 +1202,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { + #endif + #if CONFIG_MPEG1_VDPAU_HWACCEL + AV_PIX_FMT_VDPAU_MPEG1, ++ AV_PIX_FMT_VDPAU, + #endif + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE +@@ -1214,6 +1215,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { + #endif + #if CONFIG_MPEG2_VDPAU_HWACCEL + AV_PIX_FMT_VDPAU_MPEG2, ++ AV_PIX_FMT_VDPAU, + #endif + #if CONFIG_MPEG2_DXVA2_HWACCEL + AV_PIX_FMT_DXVA2_VLD, +-- +1.7.9.5 + diff --git a/lib/ffmpeg/patches/0037-backport-fix-vdpau-vc1-interlace-modes-b37cc5995b88ec68a68cb8e496a008e1cd467077.patch b/lib/ffmpeg/patches/0037-backport-fix-vdpau-vc1-interlace-modes-b37cc5995b88ec68a68cb8e496a008e1cd467077.patch new file mode 100644 index 0000000000..e27da67fff --- /dev/null +++ b/lib/ffmpeg/patches/0037-backport-fix-vdpau-vc1-interlace-modes-b37cc5995b88ec68a68cb8e496a008e1cd467077.patch @@ -0,0 +1,25 @@ +From b37cc5995b88ec68a68cb8e496a008e1cd467077 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker <fernetmenta@online.de> +Date: Sun, 5 May 2013 15:12:59 +0200 +Subject: [PATCH] fix vdpau vc1 interlace modes + +--- + libavcodec/vdpau_vc1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c +index f5da9bb..993ef26 100644 +--- a/libavcodec/vdpau_vc1.c ++++ b/libavcodec/vdpau_vc1.c +@@ -59,7 +59,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx, + else + info->picture_type = s->pict_type - 1 + s->pict_type / 3; + +- info->frame_coding_mode = v->fcm; ++ info->frame_coding_mode = v->fcm ? v->fcm + 1 : 0; + info->postprocflag = v->postprocflag; + info->pulldown = v->broadcast; + info->interlace = v->interlace; +-- +1.7.9.5 + |