• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3194ab78
    Michael Niedermayer authored
    * qatar/master:
      avcodec: add a cook parser to get subpacket duration
      FATE: allow lavf tests to alter input parameters
      FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
      FATE: replace the acodec-g726 test with 4 new encode/decode tests
      FATE: replace current g722 encoding tests with an encode/decode test
      FATE: add a pattern rule for generating asynth wav files
      FATE: optionally write a WAVE header in audiogen
      avutil: add audio fifo buffer
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/version.h
    	libavutil/avutil.h
    	tests/Makefile
    	tests/codec-regression.sh
    	tests/fate/voice.mak
    	tests/lavf-regression.sh
    	tests/ref/acodec/g722
    	tests/ref/acodec/g726
    	tests/ref/acodec/pcm_s24daud
    	tests/ref/lavf/dv_fmt
    	tests/ref/lavf/gxf
    	tests/ref/lavf/mxf
    	tests/ref/lavf/mxf_d10
    	tests/ref/seek/lavf_dv
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3194ab78
Makefile 5.69 KB