[FFmpeg-devel] [PATCH 2/2] vda: merge implementation into one file.

[jamal]

On 12/08/12 12:03 PM, Sebastien Zwickert wrote:
> ---
>  libavcodec/Makefile       |    2 -
>  libavcodec/vda.c          |  311 ---------------------------------------------
>  libavcodec/vda_h264.c     |  296 ++++++++++++++++++++++++++++++++++++++++++-
>  libavcodec/vda_internal.h |   46 -------
>  4 files changed, 291 insertions(+), 364 deletions(-)
>  delete mode 100644 libavcodec/vda.c
>  delete mode 100644 libavcodec/vda_internal.h
> 
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 911a781..251a6b2 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -60,7 +60,6 @@ RDFT-OBJS-$(CONFIG_HARDCODED_TABLES)   += sin_tables.o
>  OBJS-$(CONFIG_RDFT)                    += rdft.o $(RDFT-OBJS-yes)
>  OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
>  OBJS-$(CONFIG_VAAPI)                   += vaapi.o
> -OBJS-$(CONFIG_VDA)                     += vda.o
>  OBJS-$(CONFIG_VDPAU)                   += vdpau.o
>  OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
>  
> @@ -797,7 +796,6 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
>  SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
>  SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
>  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
> -SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
>  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
>  SKIPHEADERS-$(HAVE_OS2THREADS)         += os2threads.h
>  SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
This broke checkheaders on non-OSX systems.

Only vda_internal.h should have been removed and not the entire line, since vda.h still exists and should be skipped when VDA is not available.