aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fft.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-19 02:06:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-19 02:08:35 +0200
commita3040715e1f0db1af0c27566a306c4a27ad07dcd (patch)
tree99f852eb08e20ae2df98d78612f0a085b1649ff7 /libavcodec/fft.h
parent39aafa5ee90e10382e2f991e4d79d7852231df68 (diff)
parentf0a41afd8a37ebe972436fabfa3d289178bbd83b (diff)
downloadffmpeg-a3040715e1f0db1af0c27566a306c4a27ad07dcd.tar.gz
Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'
* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b': Not pulled: Replace mplayerhq.hu URLs by libav.org. asfdec: Remove dead code from asf_read_close(). ptx: Use av_log_ask_for_sample() where appropriate. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.h')
0 files changed, 0 insertions, 0 deletions