Do not remove HWACCEL flag with FF_API_XVMC since the
flag is supposed to be used as generic one.
---
libavcodec/avcodec.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d849765..d2a34d8 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1027,7 +1027,6 @@ typedef struct RcOverride{
*/
#define CODEC_CAP_DR1 AV_CODEC_CAP_DR1
#define CODEC_CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
-#if FF_API_XVMC
/* Codec can export data for HW decoding. This flag indicates that
* the codec would call get_format() with list that might contain HW
accelerated
* pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick
any of them
@@ -1036,7 +1035,6 @@ typedef struct RcOverride{
* chroma format, resolution etc.
*/
#define CODEC_CAP_HWACCEL 0x0010
-#endif /* FF_API_XVMC */
/**
* Encoder or decoder requires flushing with NULL input at the end in order to
* give the complete and correct output.
--
From 5d0973a6d1ec8b53d1335bed393bf3e67dc8223a Mon Sep 17 00:00:00 2001
From: Ivan Kalvachev <ikalvac...@gmail.com>
Date: Mon, 15 Feb 2016 13:16:52 +0200
Subject: [PATCH 1/2] Do not remove HWACCEL flag with FF_API_XVMC since the
flag is supposed to be used as generic one.
Signed-off-by: Ivan Kalvachev <ikalvac...@gmail.com>
---
libavcodec/avcodec.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d849765..d2a34d8 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1027,7 +1027,6 @@ typedef struct RcOverride{
*/
#define CODEC_CAP_DR1 AV_CODEC_CAP_DR1
#define CODEC_CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
-#if FF_API_XVMC
/* Codec can export data for HW decoding. This flag indicates that
* the codec would call get_format() with list that might contain HW accelerated
* pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
@@ -1036,7 +1035,6 @@ typedef struct RcOverride{
* chroma format, resolution etc.
*/
#define CODEC_CAP_HWACCEL 0x0010
-#endif /* FF_API_XVMC */
/**
* Encoder or decoder requires flushing with NULL input at the end in order to
* give the complete and correct output.
--
2.6.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
