aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/idctdsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-07 20:34:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-07 20:46:25 +0200
commit9c37c81246146ef45bba59546cc611a6e26a5b21 (patch)
tree93649b11f0eab88bffbba9bcf7d66282ad057b73 /libavcodec/x86/idctdsp.h
parent0739179bfb002324eea20f1c44c5f586b6bd3e04 (diff)
parent27f274628234c1f934b9a6a6380ed567c1b4ceae (diff)
downloadffmpeg-9c37c81246146ef45bba59546cc611a6e26a5b21.tar.gz
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae': parseutils: Make av_small_strptime public Conflicts: doc/APIchanges libavformat/utils.c libavutil/parseutils.c libavutil/version.h See: 29e972f67c914d35417bc7368493d2617abdd26e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/idctdsp.h')
0 files changed, 0 insertions, 0 deletions