]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Feb 2014 01:16:47 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Feb 2014 01:27:27 +0000 (02:27 +0100)
* qatar/master:
  dcadsp: split lfe_dir cases

Conflicts:
libavcodec/arm/dcadsp_init_arm.c

See: 45854df9a5220bdde400a447f63f61618b89dde2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dcadsp_neon.S
libavcodec/arm/dcadsp_vfp.S

Simple merge
Simple merge
Simple merge