FFmpeg/dpcm.mak at 4a4c4278b716b49b9f1653df4ac4f1f026606081 - FFmpeg - Gitea: Git with a cup of tea

virtualenv/FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00

Michael Niedermayer 4a4c4278b7 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split ADPCM and DPCM test references into separate files.
  mov, mxfdec: Employ more meaningful return values.
  lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
  wavpack: fix clipping for 32-bit lossy mode
  vb: Use bytestream2 functions

Conflicts:
	libavcodec/utils.c
	libavcodec/vb.c
	libavformat/mxfdec.c
	tests/fate/dpcm.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-01-16 01:33:35 +01:00

9 lines

254 B

Makefile

Raw Blame History

 FATE_DPCM += fate-idroq-video-dpcm
 fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
 FATE_DPCM += fate-dpcm-xan
 fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
 FATE_TESTS += $(FATE_DPCM)
 fate-dpcm: $(FATE_DPCM)