Merge branch 'master' into cj-mc1

Multimedia / Daala - Cullen Jennings [iii.ca] - 28 May 2013 15:37 UTC

3ab0d1c Merge branch 'master' into cj-mc1

.gitignore | 19 +
Makefile.am | 8 +-
autogen.sh | 4 -
configure.ac | 9 +-
doc/.gitignore | 12 +
doc/Makefile | 68 -
doc/Makefile.am | 50 +
examples/encoder_example.c | 3 +-
include/daala/daalaenc.h | 4 +-
m4/pkg.m4 | 159 +
src/decode.c | 19 +
src/encode.c | 14 +-
src/intra.c | 248 +-
src/intra.h | 26 +-
src/intradata.c |12854 ++++++++++++++++++++++++++++++++++++++++++++
src/logging.c | 85 +-
src/logging.h | 27 +
src/pvq.c | 5 +
src/state.c | 20 +-
src/tests/Makefile.am | 12 +
src/tests/logging_test.c | 50 +
tools/Makefile | 438 --
tools/Makefile.am | 270 +
tools/gen_cdf.c | 1 +
tools/image_tools.c | 1 +
tools/od_intra_data.c |10310 ++++++++++++++++++++++++++++++++++-
unix/Makefile | 10 +-
27 files changed, 24149 insertions(+), 577 deletions(-)

Upstream: git.xiph.org

  • Share