-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Work around non-standard wc implementations at more places
fate: work around non-standard wc implementations
x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
fate: use standard diff options
tta: Fix comment about channel number; TTA supports >2 channels.
avfilter: Move ff_get_ref_perms_string() to where it is used.
build: Add 'check' target to run all compile and test targets.
indeo3: validate new frame size before resetting decoder
indeo3: when freeing buffers, set pointers referencing them to NULL as well
indeo3: initialise pixel planes on allocation
indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
fate: rename psx-str-v3-mdec to mdec-v3
fate: convert psx-str to a demuxer test
lavf: add mdec to is_intra_only() list
Conflicts:
doc/developer.texi
libavcodec/indeo3.c
libavfilter/video.c
libavformat/utils.c
tests/fate/demux.mak
tests/fate/video.mak
tests/lavf-regression.sh
tests/ref/vsynth1/cljr
tests/ref/vsynth1/ffvhuff
tests/ref/vsynth2/cljr
tests/ref/vsynth2/ffvhuff
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- Makefile 3 additions, 1 deletionMakefile
- libavcodec/indeo3.c 26 additions, 14 deletionslibavcodec/indeo3.c
- libavcodec/tta.c 1 addition, 1 deletionlibavcodec/tta.c
- libavcodec/x86/ac3dsp.asm 38 additions, 21 deletionslibavcodec/x86/ac3dsp.asm
- libavcodec/x86/ac3dsp_mmx.c 5 additions, 5 deletionslibavcodec/x86/ac3dsp_mmx.c
- libavcodec/x86/rv40dsp.asm 1 addition, 1 deletionlibavcodec/x86/rv40dsp.asm
- libavcodec/x86/rv40dsp_init.c 5 additions, 5 deletionslibavcodec/x86/rv40dsp_init.c
- libavformat/utils.c 1 addition, 0 deletionslibavformat/utils.c
- tests/fate-run.sh 1 addition, 1 deletiontests/fate-run.sh
- tests/fate/demux.mak 2 additions, 5 deletionstests/fate/demux.mak
- tests/fate/video.mak 3 additions, 0 deletionstests/fate/video.mak
- tests/lavf-regression.sh 1 addition, 1 deletiontests/lavf-regression.sh
- tests/ref/fate/crc 4 additions, 4 deletionstests/ref/fate/crc
- tests/ref/fate/mdec-v3 0 additions, 0 deletionstests/ref/fate/mdec-v3
- tests/ref/fate/psx-str 0 additions, 202 deletionstests/ref/fate/psx-str
- tests/ref/fate/psx-str-demux 202 additions, 0 deletionstests/ref/fate/psx-str-demux
- tests/ref/lavf/pam 1 addition, 1 deletiontests/ref/lavf/pam
- tests/ref/lavf/ts 1 addition, 1 deletiontests/ref/lavf/ts
- tests/ref/vsynth1/cljr 1 addition, 1 deletiontests/ref/vsynth1/cljr
- tests/ref/vsynth1/dnxhd_720p_10bit 1 addition, 1 deletiontests/ref/vsynth1/dnxhd_720p_10bit
Loading
Please register or sign in to comment