[FFmpeg-devel] [PATCH 1/2] lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.

[Ronald S. Bultje]

On Mon, Aug 17, 2015 at 9:14 AM, Ronald S. Bultje <rsbultje at gmail.com>
wrote:

> Hi,
>
> On Mon, Aug 17, 2015 at 8:55 AM, Michael Niedermayer <
> michael at niedermayer.cc> wrote:
>
>> On Mon, Aug 17, 2015 at 08:19:31AM -0400, Ronald S. Bultje wrote:
>> > Hi,
>> >
>> > On Mon, Aug 17, 2015 at 8:16 AM, Michael Niedermayer
>> <michael at niedermayer.cc
>> > > wrote:
>> >
>> > > On Mon, Aug 17, 2015 at 07:10:44AM -0400, Ronald S. Bultje wrote:
>> > > > ---
>> > > >  libavcodec/error_resilience.c |  2 ++
>> > > >  libavcodec/h263dec.c          |  2 ++
>> > > >  libavcodec/h264.c             |  4 ++++
>> > > >  libavcodec/h264_picture.c     |  4 ++++
>> > > >  libavcodec/h264_slice.c       | 16 ++++++++++++----
>> > > >  libavcodec/mpeg12dec.c        | 20 +++++++++++++++++---
>> > > >  libavcodec/mpegpicture.c      |  6 +++++-
>> > > >  libavcodec/mpegvideo.c        | 11 +++++++++--
>> > > >  libavcodec/utils.c            |  2 ++
>> > > >  libavcodec/vc1dec.c           | 28 +++++++++++++++++++++-------
>> > > >  10 files changed, 78 insertions(+), 17 deletions(-)
>> > >
>> > > with:
>> > > @@ -88,7 +88,7 @@
>> > >  #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 57)
>> > >  #endif
>> > >  #ifndef FF_API_CAP_VDPAU
>> > > -#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 57)
>> > > +#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 1)
>> > >  #endif
>> > >  #ifndef FF_API_BUFS_VDPAU
>> > >  #define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 57)
>> >
>> >
>> > Change FF_API_VDPAU also. I don't think anything works if you disable
>> only
>> > one or the other, and it's not useful anyway. They're meant to be bumped
>> > together.
>>
>> this patch with:
>>
>> diff --git a/libavcodec/version.h b/libavcodec/version.h
>> index 262334f..2998cb5 100644
>> --- a/libavcodec/version.h
>> +++ b/libavcodec/version.h
>> @@ -88,7 +88,7 @@
>>  #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 57)
>>  #endif
>>  #ifndef FF_API_CAP_VDPAU
>> -#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 57)
>> +#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 1)
>>  #endif
>>  #ifndef FF_API_BUFS_VDPAU
>>  #define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 57)
>> diff --git a/libavutil/version.h b/libavutil/version.h
>> index 653f530..e5a74e3 100644
>> --- a/libavutil/version.h
>> +++ b/libavutil/version.h
>> @@ -108,7 +108,7 @@
>>  #define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 55)
>>  #endif
>>  #ifndef FF_API_VDPAU
>> -#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 55)
>> +#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 1)
>>  #endif
>>  #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
>>  #define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55)
>>
>> still fails to build:
>>
>> CC      libavcodec/h264.o
>> libavcodec/h264.c:2016:43: error: ‘AV_CODEC_CAP_HWACCEL_VDPAU’ undeclared
>> here (not in a function)
>> libavcodec/h264.c:2018:48: error: ‘AV_PIX_FMT_VDPAU_H264’ undeclared here
>> (not in a function)
>> make: *** [libavcodec/h264.o] Error 1
>
>
> Did you apply patch 2/2 also? If not, can you please apply that also and
> re-try?
>

Oh I see it's the actual decoders themselves. Let me see what I can do.

Ronald