aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mdct_float.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-12 04:41:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-12 04:43:21 +0100
commit0d487654ea8515d916f5d3b9e208fe39d9723fc5 (patch)
treef019b6d3cc2dc16da9ce2fc8f42ccd940fabbc76 /libavcodec/mdct_float.c
parent1cc9468289b266e4a8ff62d520be832f103f0afa (diff)
parentfe568b3d27ca2c5cca3878b2a7a3a968e605aec4 (diff)
downloadffmpeg-0d487654ea8515d916f5d3b9e208fe39d9723fc5.tar.gz
Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4': http: Improve options descriptions Conflicts: doc/protocols.texi libavformat/http.c See: 255ec768da6f6e821775888621da2156764598da See: 0a7cd740438b46e3b9fbf406ca5a948a6f027c97 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mdct_float.c')
0 files changed, 0 insertions, 0 deletions