mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-05 20:43:26 +00:00
7beadfe1f7
* qatar/master: mov_chan: Only set the channel_layout if setting it to a nonzero value mov_chan: Reindent an incorrectly indented line mp2 muxer: mark as AVFMT_NOTIMESTAMPS. x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64 x86: more specific checks for availability of required assembly capabilities x86: avcodec: Drop silly "_mmx" suffix from dsputil template names fate: Drop redundant setting of FUZZ to 1 cavsdsp: set idct permutation independently of dsputil x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 lines
449 B
Makefile
14 lines
449 B
Makefile
FATE_MPC += fate-mpc7-demux
|
|
fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
|
|
|
|
FATE_MPC += fate-mpc8-demux
|
|
fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
|
|
|
|
FATE_MPC += fate-musepack7
|
|
fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
|
|
fate-musepack7: CMP = oneoff
|
|
fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
|
|
|
|
FATE_SAMPLES_FFMPEG += $(FATE_MPC)
|
|
fate-mpc: $(FATE_MPC)
|