[FFmpeg-devel,1/2] lavc/qsvenc: ICQ/VCM/QVBR are not avilable on Linux

Submitted by Zhong Li on Dec. 7, 2017, 6:24 a.m.

Details

Message ID 1512627860-19796-1-git-send-email-zhong.li@intel.com
State New
Headers show

Commit Message

Zhong Li Dec. 7, 2017, 6:24 a.m.
Signed-off-by: Zhong Li <zhong.li@intel.com>
---
 libavcodec/qsvenc.h | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Carl Eugen Hoyos Dec. 8, 2017, 12:39 a.m.
2017-12-07 7:24 GMT+01:00 Zhong Li <zhong.li@intel.com>:
> Signed-off-by: Zhong Li <zhong.li@intel.com>
> ---
>  libavcodec/qsvenc.h | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> index 5cfd174..fae98e1 100644
> --- a/libavcodec/qsvenc.h
> +++ b/libavcodec/qsvenc.h
> @@ -44,9 +44,16 @@
>  #define QSV_HAVE_LA     QSV_VERSION_ATLEAST(1, 7)
>  #define QSV_HAVE_LA_DS  QSV_VERSION_ATLEAST(1, 8)
>  #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11)
> +
> +#if defined(_WIN32)
>  #define QSV_HAVE_ICQ    QSV_VERSION_ATLEAST(1, 8)
>  #define QSV_HAVE_VCM    QSV_VERSION_ATLEAST(1, 8)
>  #define QSV_HAVE_QVBR   QSV_VERSION_ATLEAST(1, 11)
> +#else
> +#define QSV_HAVE_ICQ    0
> +#define QSV_HAVE_VCM    0
> +#define QSV_HAVE_QVBR   0
> +#endif

Perhaps "... are only available on Windows" would put
the commit message and the patch more in-line.

Carl Eugen
Zhong Li Dec. 8, 2017, 2:30 a.m.
> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf

> Of Carl Eugen Hoyos

> Sent: Friday, December 8, 2017 8:39 AM

> To: FFmpeg development discussions and patches

> <ffmpeg-devel@ffmpeg.org>

> Subject: Re: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc: ICQ/VCM/QVBR are

> not avilable on Linux

> 

> 2017-12-07 7:24 GMT+01:00 Zhong Li <zhong.li@intel.com>:

> > Signed-off-by: Zhong Li <zhong.li@intel.com>

> > ---

> >  libavcodec/qsvenc.h | 7 +++++++

> >  1 file changed, 7 insertions(+)

> >

> > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index

> > 5cfd174..fae98e1 100644

> > --- a/libavcodec/qsvenc.h

> > +++ b/libavcodec/qsvenc.h

> > @@ -44,9 +44,16 @@

> >  #define QSV_HAVE_LA     QSV_VERSION_ATLEAST(1, 7)

> >  #define QSV_HAVE_LA_DS  QSV_VERSION_ATLEAST(1, 8)  #define

> > QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11)

> > +

> > +#if defined(_WIN32)

> >  #define QSV_HAVE_ICQ    QSV_VERSION_ATLEAST(1, 8)

> >  #define QSV_HAVE_VCM    QSV_VERSION_ATLEAST(1, 8)

> >  #define QSV_HAVE_QVBR   QSV_VERSION_ATLEAST(1, 11)

> > +#else

> > +#define QSV_HAVE_ICQ    0

> > +#define QSV_HAVE_VCM    0

> > +#define QSV_HAVE_QVBR   0

> > +#endif

> 

> Perhaps "... are only available on Windows" would put the commit message

> and the patch more in-line.


Good suggestion, will update.

Patch hide | download patch | download mbox

diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 5cfd174..fae98e1 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -44,9 +44,16 @@ 
 #define QSV_HAVE_LA     QSV_VERSION_ATLEAST(1, 7)
 #define QSV_HAVE_LA_DS  QSV_VERSION_ATLEAST(1, 8)
 #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11)
+
+#if defined(_WIN32)
 #define QSV_HAVE_ICQ    QSV_VERSION_ATLEAST(1, 8)
 #define QSV_HAVE_VCM    QSV_VERSION_ATLEAST(1, 8)
 #define QSV_HAVE_QVBR   QSV_VERSION_ATLEAST(1, 11)
+#else
+#define QSV_HAVE_ICQ    0
+#define QSV_HAVE_VCM    0
+#define QSV_HAVE_QVBR   0
+#endif
 
 #define QSV_COMMON_OPTS \
 { "async_depth", "Maximum processing parallelism", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VE },                          \