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

[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 <philipl at overt.org>
> ---
>  libavcodec/vc1dec.c         | 1 +
>  libavcodec/vdpau_internal.h | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)

this breaks build (with clang at least)

CC      libavcodec/h264.o
In file included from ffmpeg/libavcodec/h264.c:1:
In file included from ffmpeg/libavcodec/h264.c:52:
ffmpeg/libavcodec/vdpau_internal.h:38:28: error: redefinition of typedef 'H264Context' is invalid in C [-Wtypedef-redefinition]
typedef struct H264Context H264Context;
                           ^
ffmpeg/libavcodec/h264.h:799:3: note: previous definition is here
} H264Context;
  ^
1 error generated.
make: *** [libavcodec/h264.o] Error 1

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150525/c24fce66/attachment.asc>