On Mon, May 25, 2015 at 04:29:12PM -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. > > However, some of the pre-hwaccel helper functions need h264.h. To avoid > messy collisions, let's move the declaration of all those helpers to > a separate header which we will exclude for the hevc support (which will > be hwaccel-only). > > Signed-off-by: Philip Langdale <phil...@overt.org> > --- > libavcodec/h263dec.c | 2 +- > libavcodec/h264.c | 2 +- > libavcodec/h264_picture.c | 2 +- > libavcodec/mpeg12dec.c | 2 +- > libavcodec/vc1dec.c | 2 +- > libavcodec/vdpau.c | 1 + > libavcodec/vdpau_compat.h | 48 > +++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/vdpau_internal.h | 19 ------------------ > 8 files changed, 54 insertions(+), 24 deletions(-) > create mode 100644 libavcodec/vdpau_compat.h
seems building fine here [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB DNS cache poisoning attacks, popular search engine, Google internet authority dont be evil, please
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
