From b760ffdd07eaabf66656f3b2215c7da1c39a60ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 17 Oct 2012 23:00:54 +0300 Subject: [PATCH 1/6] aviobuf: Remove a senseless ifdef in avio_seek MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This seemed to assume that one never used writing avio unless muxers or networking was enabled. This ifdef is a remnant since 8fa641f8. Signed-off-by: Martin Storsjö --- libavformat/aviobuf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index da836c6fd5..15d132de29 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -215,12 +215,10 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) } else { int64_t res; -#if CONFIG_MUXERS || CONFIG_NETWORK if (s->write_flag) { flush_buffer(s); s->must_flush = 1; } -#endif /* CONFIG_MUXERS || CONFIG_NETWORK */ if (!s->seek) return AVERROR(EPIPE); if ((res = s->seek(s->opaque, offset, SEEK_SET)) < 0) From 53e8cd68b722895a7110a2f7ee7e1bd42f4bac3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 13 Oct 2012 15:57:56 +0300 Subject: [PATCH 2/6] configure: Split out msvc as a separate target OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The name mingw32 as target OS is both misleading, and very little of the target OS specific settings actually match. Since the target OS default is set based on uname, the default (which on MSYS is set to mingw) is overridden by --toolchain=msvc. Signed-off-by: Martin Storsjö --- configure | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 800f22c1bb..398f4c0651 100755 --- a/configure +++ b/configure @@ -1989,8 +1989,6 @@ if enabled cross_compile; then die "Must specify target arch and OS when cross-compiling" fi -set_default arch target_os - ar_default="${cross_prefix}${ar_default}" cc_default="${cross_prefix}${cc_default}" nm_default="${cross_prefix}${nm_default}" @@ -2015,13 +2013,14 @@ case "$toolchain" in ld_default="c99wrap link" nm_default="dumpbin -symbols" ar_default="lib" + target_os_default="win32" ;; ?*) die "Unknown toolchain $toolchain" ;; esac -set_default cc pkg_config sysinclude +set_default arch cc pkg_config sysinclude target_os enabled cross_compile || host_cc_default=$cc set_default host_cc @@ -2032,7 +2031,7 @@ fi exesuf() { case $1 in - mingw32*|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;; + mingw32*|win32|win64|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;; esac } @@ -2761,6 +2760,11 @@ case $target_os in enable dos_paths add_cppflags -U__STRICT_ANSI__ ;; + win32|win64) + objformat="win32" + ranlib=: + enable dos_paths + ;; cygwin*) target_os=cygwin shlibdir_default="$bindir_default" From fc085c5b33a966ad893757ab1c4269bf829ce499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 18 Oct 2012 10:23:12 +0300 Subject: [PATCH 3/6] gxf: Add a local copy of the relevant parts of the frame rate table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids having to share this table across the library boundaries. This shared table used to be problematic, if always declaring all exported data symbols with the dllimport attribute (even while building that same library), since it needs to be a link-time constant when it is used in AVCodec declarations (in mpeg12enc.c). Signed-off-by: Martin Storsjö --- libavformat/gxf.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 04d75bd4f2..2593c0642b 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -180,6 +180,18 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info } } +static const AVRational frame_rate_tab[] = { + { 60, 1}, + {60000, 1001}, + { 50, 1}, + { 30, 1}, + {30000, 1001}, + { 25, 1}, + { 24, 1}, + {24000, 1001}, + { 0, 0}, +}; + /** * @brief convert fps tag value to AVRational fps * @param fps fps value from tag @@ -187,7 +199,7 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info */ static AVRational fps_tag2avr(int32_t fps) { if (fps < 1 || fps > 9) fps = 9; - return avpriv_frame_rate_tab[9 - fps]; // values have opposite order + return frame_rate_tab[fps - 1]; } /** From eaa9b2e66c04d234eab85e2991d756ee36858808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 18 Oct 2012 10:30:03 +0300 Subject: [PATCH 4/6] avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This table doesn't need to be shared with libavformat any longer. Add mpeg12 to the name to make it less ambiguous, while renaming it. Signed-off-by: Martin Storsjö --- libavcodec/cavsdec.c | 4 ++-- libavcodec/dirac.c | 2 +- libavcodec/mpeg12.c | 8 ++++---- libavcodec/mpeg12data.c | 2 +- libavcodec/mpeg12data.h | 2 +- libavcodec/mpeg12enc.c | 8 ++++---- libavcodec/mpegvideo_parser.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index b1dd3bd27b..3c7f79bafb 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1081,8 +1081,8 @@ static int decode_seq_header(AVSContext *h) { s->low_delay = get_bits1(&s->gb); h->mb_width = (s->width + 15) >> 4; h->mb_height = (s->height + 15) >> 4; - h->s.avctx->time_base.den = avpriv_frame_rate_tab[frame_rate_code].num; - h->s.avctx->time_base.num = avpriv_frame_rate_tab[frame_rate_code].den; + h->s.avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num; + h->s.avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den; h->s.avctx->width = s->width; h->s.avctx->height = s->height; if(!h->top_qp) diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index 070ea0f522..e11fea761e 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -165,7 +165,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, /* [DIRAC_STD] preset_frame_rate(video_params, index) */ if (source->frame_rate_index > 0) { if (source->frame_rate_index <= 8) - frame_rate = avpriv_frame_rate_tab[source->frame_rate_index]; + frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index]; else /* [DIRAC_STD] Table 10.3 values 9-10 */ frame_rate = dirac_frame_rate[source->frame_rate_index-9]; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index a5dcccf3dc..df8afec611 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1239,8 +1239,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) { //MPEG-1 fps - avctx->time_base.den = avpriv_frame_rate_tab[s->frame_rate_index].num; - avctx->time_base.num = avpriv_frame_rate_tab[s->frame_rate_index].den; + avctx->time_base.den = ff_mpeg12_frame_rate_tab[s->frame_rate_index].num; + avctx->time_base.num = ff_mpeg12_frame_rate_tab[s->frame_rate_index].den; //MPEG-1 aspect avctx->sample_aspect_ratio = av_d2q(1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); avctx->ticks_per_frame=1; @@ -1248,8 +1248,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) //MPEG-2 fps av_reduce(&s->avctx->time_base.den, &s->avctx->time_base.num, - avpriv_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, - avpriv_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, + ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, + ff_mpeg12_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, 1 << 30); avctx->ticks_per_frame = 2; //MPEG-2 aspect diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index a0dd6e5784..ccc3d2deb9 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -305,7 +305,7 @@ const uint8_t ff_mpeg12_mbMotionVectorTable[17][2] = { { 0xc, 10 }, }; -const AVRational avpriv_frame_rate_tab[16] = { +const AVRational ff_mpeg12_frame_rate_tab[16] = { { 0, 0}, {24000, 1001}, { 24, 1}, diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index 86ba3ec15f..633a2915e6 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -48,7 +48,7 @@ extern const uint8_t ff_mpeg12_mbPatTable[64][2]; extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2]; -extern const AVRational avpriv_frame_rate_tab[]; +extern const AVRational ff_mpeg12_frame_rate_tab[]; extern const float ff_mpeg1_aspect[16]; extern const AVRational ff_mpeg2_aspect[16]; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 7048b5dc97..ceb31e0270 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -111,7 +111,7 @@ static int find_frame_rate_index(MpegEncContext *s){ int64_t d; for(i=1;i<14;i++) { - int64_t n0= 1001LL/avpriv_frame_rate_tab[i].den*avpriv_frame_rate_tab[i].num*s->avctx->time_base.num; + int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den * ff_mpeg12_frame_rate_tab[i].num * s->avctx->time_base.num; int64_t n1= 1001LL*s->avctx->time_base.den; if(s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && i>=9) break; @@ -195,7 +195,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA) if (s->current_picture.f.key_frame) { - AVRational framerate= avpriv_frame_rate_tab[s->frame_rate_index]; + AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; /* mpeg1 header repeated every gop */ put_header(s, SEQ_START_CODE); @@ -958,7 +958,7 @@ AVCodec ff_mpeg1video_encoder = { .init = encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .supported_framerates = avpriv_frame_rate_tab+1, + .supported_framerates = ff_mpeg12_frame_rate_tab + 1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, @@ -974,7 +974,7 @@ AVCodec ff_mpeg2video_encoder = { .init = encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .supported_framerates = avpriv_frame_rate_tab + 1, + .supported_framerates = ff_mpeg12_frame_rate_tab + 1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index f1fc4a0e89..051796e0c0 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -65,8 +65,8 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, did_set_size=1; } frame_rate_index = buf[3] & 0xf; - pc->frame_rate.den = avctx->time_base.den = avpriv_frame_rate_tab[frame_rate_index].num; - pc->frame_rate.num = avctx->time_base.num = avpriv_frame_rate_tab[frame_rate_index].den; + pc->frame_rate.den = avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_index].num; + pc->frame_rate.num = avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_index].den; avctx->bit_rate = ((buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6))*400; avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; } From d66c52c2b369401ba4face1c171ccb19130b7a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 18 Oct 2012 11:53:19 +0300 Subject: [PATCH 5/6] Add support for building shared libraries with MSVC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This requires the makedef perl script by Derek, from the c89-to-c99 repo. That scripts produces a .def file, listing the symbols to be exported, based on the gcc version scripts and the built object files. To properly load non-function symbols from DLL files, the data symbol declarations need to have the attribute __declspec(dllimport) when building the calling code. (On mingw, the linker can fix this up automatically, which is why it has not been an issue so far. If this attribute is omitted, linking actually succeeds, but reads from the table will not produce the desired results at runtime.) MSVC seems to manage to link DLLs (and run properly) even if this attribute is present while building the library itself (which normally isn't recommended) - other object files in the same library manage to link to the symbol (with a small warning at link time, like "warning LNK4049: locally defined symbol _avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible to squelch this warning), and the definition of the tables themselves produce a warning that can be squelched ("warning C4273: 'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous definition of 'avpriv_mpa_bitrate_tab'). In this setup, mingw isn't able to link object files that refer to data symbols with __declspec(dllimport) without those symbols actually being linked via a DLL (linking avcodec.dll ends up with errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'"). The dllimport declspec isn't needed at all in mingw, so we simply choose not to declare it for other compilers than MSVC that requires it. (If ICL support later requires it, the condition can be extended later to include both of them.) This also implies that code that is built to link to a certain library as a DLL can't link to the same library as a static library. Therefore, we only allow building either static or shared but not both at the same time. (That is, static libraries as such can be, and actually are, built - this is used for linking the test tools to internal symbols in the libraries - but e.g. libavformat built to link to libavcodec as a DLL cannot link statically to libavcodec.) Also, linking to DLLs is slightly different from linking to shared libraries on other platforms. DLLs use a thing called import libraries, which is basically a stub library allowing the linker to know which symbols exist in the DLL and what name the DLL will have at runtime. In mingw/gcc, the import library is usually named libfoo.dll.a, which goes next to a static library named libfoo.a. This allows gcc to pick the dynamic one, if available, from the normal -lfoo switches, just as it does for libfoo.a vs libfoo.so on Unix. On MSVC however, you need to literally specify the name of the import library instead of the static library. Signed-off-by: Martin Storsjö --- configure | 21 ++++++++++++++++++++- libavcodec/ac3tab.h | 2 +- libavcodec/dca.h | 3 ++- libavcodec/mjpeg.h | 14 +++++++------- libavcodec/mpeg4audio.h | 2 +- libavcodec/mpegaudiodata.h | 6 ++++-- libavutil/internal.h | 6 ++++++ 7 files changed, 41 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 398f4c0651..218e51301a 100755 --- a/configure +++ b/configure @@ -2095,7 +2095,7 @@ msvc_flags(){ -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \ -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \ -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \ - -wd4996 ;; + -wd4996 -wd4273 ;; -std=c99) ;; -fno-math-errno) ;; -fno-common) ;; @@ -2761,6 +2761,25 @@ case $target_os in add_cppflags -U__STRICT_ANSI__ ;; win32|win64) + if enabled shared; then + # Link to the import library instead of the normal static library + # for shared libs. + LD_LIB='%.lib' + # Cannot build shared and static libraries at the same time with + # MSVC. + disable static + fi + shlibdir_default="$bindir_default" + SLIBPREF="" + SLIBSUF=".dll" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' + SLIB_CREATE_DEF_CMD='makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' + SLIB_INSTALL_LINKS= + SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' + SLIB_INSTALL_EXTRA_LIB='$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' + SHFLAGS='-dll -def:$$(@:$(SLIBSUF)=.def) -implib:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' objformat="win32" ranlib=: enable dos_paths diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 8ed50520e6..c2b3febcb7 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -33,7 +33,7 @@ extern const uint16_t ff_ac3_frame_size_tab[38][3]; extern const uint8_t ff_ac3_channels_tab[8]; -extern const uint16_t avpriv_ac3_channel_layout_tab[8]; +extern av_export const uint16_t avpriv_ac3_channel_layout_tab[8]; extern const uint8_t ff_ac3_enc_channel_map[8][2][6]; extern const uint8_t ff_ac3_dec_channel_map[8][2][6]; extern const uint16_t ff_ac3_sample_rate_tab[3]; diff --git a/libavcodec/dca.h b/libavcodec/dca.h index 1515270471..76342f0ab9 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -26,6 +26,7 @@ #define AVCODEC_DCA_H #include +#include "libavutil/internal.h" /** DCA syncwords, also used for bitstream type detection */ #define DCA_MARKER_RAW_BE 0x7FFE8001 @@ -36,6 +37,6 @@ /** DCA-HD specific block starts with this marker. */ #define DCA_HD_MARKER 0x64582025 -extern const uint32_t avpriv_dca_sample_rates[16]; +extern av_export const uint32_t avpriv_dca_sample_rates[16]; #endif /* AVCODEC_DCA_H */ diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 1374ab319f..a69b519184 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -137,16 +137,16 @@ static inline void put_marker(PutBitContext *p, int code) case 7: ret= (left + top)>>1; break;\ } -extern const uint8_t avpriv_mjpeg_bits_dc_luminance[]; -extern const uint8_t avpriv_mjpeg_val_dc[]; +extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_dc[]; -extern const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; -extern const uint8_t avpriv_mjpeg_bits_ac_luminance[]; -extern const uint8_t avpriv_mjpeg_val_ac_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[]; -extern const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; -extern const uint8_t avpriv_mjpeg_val_ac_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[]; void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, const uint8_t *bits_table, diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 1ee2d7e2c7..e71122d0d3 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -40,7 +40,7 @@ typedef struct MPEG4AudioConfig { int ps; ///< -1 implicit, 1 presence } MPEG4AudioConfig; -extern const int avpriv_mpeg4audio_sample_rates[16]; +extern av_export const int avpriv_mpeg4audio_sample_rates[16]; extern const uint8_t ff_mpeg4audio_channels[8]; /** diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h index d1a8841f98..2b8ff6587f 100644 --- a/libavcodec/mpegaudiodata.h +++ b/libavcodec/mpegaudiodata.h @@ -29,11 +29,13 @@ #include +#include "libavutil/internal.h" + #define MODE_EXT_MS_STEREO 2 #define MODE_EXT_I_STEREO 1 -extern const uint16_t avpriv_mpa_bitrate_tab[2][3][15]; -extern const uint16_t avpriv_mpa_freq_tab[3]; +extern av_export const uint16_t avpriv_mpa_bitrate_tab[2][3][15]; +extern av_export const uint16_t avpriv_mpa_freq_tab[3]; extern const int ff_mpa_sblimit_table[5]; extern const int ff_mpa_quant_steps[17]; extern const int ff_mpa_quant_bits[17]; diff --git a/libavutil/internal.h b/libavutil/internal.h index e61a629f05..9fd105145c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -47,6 +47,12 @@ #endif #endif +#if defined(_MSC_VER) && CONFIG_SHARED +# define av_export __declspec(dllimport) +#else +# define av_export +#endif + #ifndef INT_BIT # define INT_BIT (CHAR_BIT * sizeof(int)) #endif From c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:12:54 +0100 Subject: [PATCH 6/6] fate: add a dependency helper macro Signed-off-by: Mans Rullgard --- tests/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index d3b4bcb3d7..8fa8a027ab 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -33,6 +33,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