aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegaudiodsp_fixed.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-16 01:36:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-16 01:36:49 +0100
commit4257ce112c41f741408b817d305630dadc3ee52d (patch)
tree7121a52130f9b73dd4a2cdbae2d71d50918a39d5 /libavcodec/mpegaudiodsp_fixed.c
parentc743aad557fe14980b9912869d90008ecb29ba97 (diff)
parent702985b8b7bfe0d8eac2747f3a03e7f15886364c (diff)
downloadffmpeg-4257ce112c41f741408b817d305630dadc3ee52d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dxa: remove useless code lavf: don't select an attached picture as default stream for seeking. avconv: remove pointless checks. avconv: check for get_filtered_frame() failure. avconv: remove a pointless check. swscale: convert hscale() to use named arguments. x86inc: add *mp named argument support to DEFINE_ARGS. swscale: convert hscale to cpuflags(). Conflicts: ffmpeg.c libswscale/x86/scale.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodsp_fixed.c')
0 files changed, 0 insertions, 0 deletions