Re: [FFmpeg-devel] [PATCH] avcodec/vdpau: Don't leak h264.h into all VDPAU codecs

2015-05-25 Thread Philip Langdale
On Mon, 25 May 2015 13:14:05 -0700 Philip Langdale wrote: > On Mon, 25 May 2015 20:34:34 +0200 > Michael Niedermayer wrote: > > > On Mon, May 25, 2015 at 09:46:14AM -0700, Philip Langdale wrote: > > > h264.h and hevc.h are mutually exclusive due to defining some of > > > the same names. As such

Re: [FFmpeg-devel] [PATCH] avcodec/vdpau: Don't leak h264.h into all VDPAU codecs

2015-05-25 Thread Philip Langdale
On Mon, 25 May 2015 20:34:34 +0200 Michael Niedermayer wrote: > On Mon, May 25, 2015 at 09:46:14AM -0700, Philip Langdale wrote: > > h264.h and hevc.h are mutually exclusive due to defining some of > > the same names. As such, we need to avoid forcing h264.h to be > > included if we want hevc dec

Re: [FFmpeg-devel] [PATCH] avcodec/vdpau: Don't leak h264.h into all VDPAU codecs

2015-05-25 Thread Michael Niedermayer
On Mon, May 25, 2015 at 09:46:14AM -0700, Philip Langdale wrote: > h264.h and hevc.h are mutually exclusive due to defining some of the same > names. As such, we need to avoid forcing h264.h to be included if we want > hevc decode acceleration to be possible. > > Signed-off-by: Philip Langdale >

[FFmpeg-devel] [PATCH] avcodec/vdpau: Don't leak h264.h into all VDPAU codecs

2015-05-25 Thread Philip Langdale
h264.h and hevc.h are mutually exclusive due to defining some of the same names. As such, we need to avoid forcing h264.h to be included if we want hevc decode acceleration to be possible. Signed-off-by: Philip Langdale --- libavcodec/vc1dec.c | 1 + libavcodec/vdpau_internal.h | 3 ++-