-
- Downloads
Merge remote-tracking branch 'qatar/master'
* 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:
Michael Niedermayer <michaelni@gmx.at>
Showing
- doc/APIchanges 12 additions, 0 deletionsdoc/APIchanges
- libavcodec/Makefile 1 addition, 0 deletionslibavcodec/Makefile
- libavcodec/allcodecs.c 1 addition, 0 deletionslibavcodec/allcodecs.c
- libavcodec/cook_parser.c 59 additions, 0 deletionslibavcodec/cook_parser.c
- libavcodec/version.h 2 additions, 2 deletionslibavcodec/version.h
- libavformat/daud.c 1 addition, 1 deletionlibavformat/daud.c
- libavformat/rmdec.c 1 addition, 0 deletionslibavformat/rmdec.c
- libavutil/Makefile 2 additions, 0 deletionslibavutil/Makefile
- libavutil/audio_fifo.c 193 additions, 0 deletionslibavutil/audio_fifo.c
- libavutil/audio_fifo.h 146 additions, 0 deletionslibavutil/audio_fifo.h
- libavutil/avutil.h 1 addition, 1 deletionlibavutil/avutil.h
- tests/Makefile 4 additions, 1 deletiontests/Makefile
- tests/audiogen.c 48 additions, 8 deletionstests/audiogen.c
- tests/codec-regression.sh 0 additions, 13 deletionstests/codec-regression.sh
- tests/fate/pcm.mak 5 additions, 0 deletionstests/fate/pcm.mak
- tests/fate/voice.mak 31 additions, 4 deletionstests/fate/voice.mak
- tests/lavf-regression.sh 17 additions, 17 deletionstests/lavf-regression.sh
- tests/ref/acodec/g722 0 additions, 4 deletionstests/ref/acodec/g722
- tests/ref/acodec/g726 0 additions, 4 deletionstests/ref/acodec/g726
- tests/ref/acodec/pcm_s24daud 0 additions, 4 deletionstests/ref/acodec/pcm_s24daud
Loading
Please register or sign in to comment