aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/videodsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-25 19:24:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-25 20:26:00 +0100
commit1f2bacc897224db0a0940f0c6d08caf6b15f1017 (patch)
treecf078726e32d56dde5af54368ffae31ba7aa5a71 /libavcodec/videodsp.h
parent9e329185d701f60412eb70c4ffbeb345bd459e82 (diff)
parente7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a (diff)
downloadffmpeg-1f2bacc897224db0a0940f0c6d08caf6b15f1017.tar.gz
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a': libavfilter: example audio filtering program Conflicts: .gitignore configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/videodsp.h')
0 files changed, 0 insertions, 0 deletions