[xiph-commits] r8015 - in experimental/derf/theora-exp: examples
unix
tterribe at motherfish-iii.xiph.org
tterribe at motherfish-iii.xiph.org
Fri Oct 15 07:35:16 PDT 2004
Author: tterribe
Date: 2004-10-15 07:35:15 -0700 (Fri, 15 Oct 2004)
New Revision: 8015
Modified:
experimental/derf/theora-exp/examples/player_example.c
experimental/derf/theora-exp/unix/Makefile
Log:
Some build fixes.
Thanks to Adam D. Moss for the original patch.
Modified: experimental/derf/theora-exp/examples/player_example.c
===================================================================
--- experimental/derf/theora-exp/examples/player_example.c 2004-10-15 14:23:52 UTC (rev 8014)
+++ experimental/derf/theora-exp/examples/player_example.c 2004-10-15 14:35:15 UTC (rev 8015)
@@ -327,13 +327,14 @@
}
static void video_write(void){
+ static const int planemap[3] = {0,2,1};
int pli;
int wscale, hscale;
int i;
theora_ycbcr_buffer ycbcr;
int crop_offset;
+
theora_decode_ycbcr_out(td,ycbcr);
- int planemap[] = {0,2,1};
/* Lock SDL_yuv_overlay */
if ( SDL_MUSTLOCK(screen) ) {
Modified: experimental/derf/theora-exp/unix/Makefile
===================================================================
--- experimental/derf/theora-exp/unix/Makefile 2004-10-15 14:23:52 UTC (rev 8014)
+++ experimental/derf/theora-exp/unix/Makefile 2004-10-15 14:35:15 UTC (rev 8015)
@@ -17,14 +17,15 @@
# The location of include files.
# Modify these to point to your Ogg and Vorbis include directories if they are
# not installed in a standard location.
-CINCLUDE = -I/usr/include/SDL -D_REENTRANT
+CINCLUDE = `sdl-config --cflags` -D_REENTRANT
# Extra compilation flags.
# You may get speed increases by including flags such as -O2 or -O3 or
# -ffast-math, or additional flags, depending on your system and compiler.
# The -g flag will generally include debugging information.
CFLAGS = -g
# Libraries to link with, and the location of library files.
-LIBS = -logg -lvorbis -lvorbisenc
+# Add -lpng -lz if you want to enable OC_DUMP_IMAGES.
+LIBS = -logg -lvorbis -lvorbisenc `sdl-config --libs`
# ANYTHING BELOW THIS LINE PROBABLY DOES NOT NEED EDITING
CINCLUDE := -I../include ${CINCLUDE}
@@ -82,17 +83,6 @@
huffenc.h \
psych.h \
-LIBTHEORAENC_CSOURCES = \
-bitrate.c \
-encinfo.c \
-encode.c \
-enquant.c \
-fdct.c \
-huffenc.c \
-impmap.c \
-mcenc.c \
-psych.c \
-
DUMP_VIDEO_CSOURCES = dump_video.c
ENCODER_EXAMPLE_CSOURCES = encoder_example.c
PLAYER_EXAMPLE_CSOURCES = player_example.c
@@ -175,6 +165,9 @@
-rm ${ALL_OBJS} ${ALL_DEPS} ${ALL_TARGETS}
-rmdir ${WORKDIR}
+# Make everything depend on changes in the Makefile
+${ALL_OBJS} ${ALL_DEPS} ${ALL_TARGETS} : Makefile
+
# Specify which targets are phony for GNU make
.PHONY : all clean
More information about the commits
mailing list