diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
commit | b0554fec0470bf59b0582c80697d28646e37b854 (patch) | |
tree | 1f111a02df3a1e29f29ed963fb32ccfa72f2cce1 /tests/Makefile | |
parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
download | ffmpeg-streaming-b0554fec0470bf59b0582c80697d28646e37b854.zip ffmpeg-streaming-b0554fec0470bf59b0582c80697d28646e37b854.tar.gz |
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
-rw-r--r-- | tests/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index e358fbd..a0210c7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -54,6 +54,8 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) +DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) + include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak |