diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 01:12:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 01:12:08 +0100 |
| commit | 8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51 (patch) | |
| tree | 08342b8eede67521c32c139ebb4d9ddd04e871fa /libavcodec/Makefile | |
| parent | 1af9fdc3baa47596757da7c401d58710cef45c75 (diff) | |
| parent | ffae713a5b3a0d20ff958d8bd58a052b495c38fd (diff) | |
| download | ffmpeg-8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix a bunch of common typos.
build: Skip compiling xvmc.h under the correct condition.
configure: darwin: Change dylib install names to include major version.
mpegts: Always honor a registration descriptor if present and there is no other codec information.
aacdec: Fix SCE parity check.
aacdec: Fix out of array writes (stack).
rtsp: Only set the ttl parameter if the server actually gave a value
udp: Set ttl for read-write streams, too, not only for write-only ones
udp: Only bind to the multicast address if in read-only mode
udp: Clarify the comment about binding the multicast address
udp: Reorder comments
Conflicts:
libavcodec/aacdec.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 29ed9575f1..69ba63228a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -741,10 +741,10 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h +SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h -SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h TESTPROGS = cabac dct fft fft-fixed golomb iirfilter rangecoder snowenc |