• 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
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...