aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/dirac_dwt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-18 17:11:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-18 17:18:19 +0200
commitdaa7bccad2279d43e7173dba0174c2052a65a51f (patch)
tree76252a7e18c59bbe1245674a27ae916c29d74655 /libavcodec/x86/dirac_dwt.c
parent5439959ef013670d8974e88acb85bd03055a6229 (diff)
parent894682a9739eb8d4bfc024b0d4e5757fcfe47378 (diff)
downloadffmpeg-daa7bccad2279d43e7173dba0174c2052a65a51f.tar.gz
Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'
* commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378': Remove avserver. Conflicts: .gitignore Changelog Makefile configure doc/ffserver.conf doc/ffserver.texi doc/general.texi ffserver.c libavformat/Makefile libavformat/ffm.h libavformat/ffmdec.c libavformat/ffmenc.c tests/fate/avformat.mak tests/lavf-regression.sh tests/ref/lavf/ffm tests/ref/seek/lavf-ffm Not merged, ffserver does have a maintainer co maintainers are welcome and needed though ! Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dirac_dwt.c')
0 files changed, 0 insertions, 0 deletions