*** ./libavcodec/ratecontrol.c.uw7 Thu Oct 26 20:30:09 2006 --- ./libavcodec/ratecontrol.c Sun Nov 12 14:24:27 2006 *************** *** 33,38 **** --- 33,44 ---- #undef NDEBUG // allways check asserts, the speed effect is far too small to disable them #include + #include + + #ifdef isnan + #undef isnan + extern int isnan(double); + #endif #ifndef M_E #define M_E 2.718281828 *** ./libavcodec/opt.c.uw7 Thu Oct 26 20:30:08 2006 --- ./libavcodec/opt.c Sun Nov 12 14:24:27 2006 *************** *** 29,34 **** --- 29,41 ---- #include "avcodec.h" #include "opt.h" #include "eval.h" + #include + + #ifdef isnan + #undef isnan + extern int isnan(double); + #endif + //FIXME order them and do a bin search static AVOption *find_opt(void *v, const char *name, const char *unit){ *** ./libavcodec/Makefile.uw7 Thu Oct 26 20:30:09 2006 --- ./libavcodec/Makefile Sun Nov 12 14:24:27 2006 *************** *** 443,446 **** --- 443,452 ---- fft-test: fft-test.o $(LIB) + cabac.o: cabac.c + $(CC) -O3 $(CFLAGS) -c -o $@ cabac.c + + h264.o: h264.c + $(CC) -O3 $(CFLAGS) -c -o $@ h264.c + .PHONY: amrlibs tests *** ./libavcodec/mpeg12.c.uw7 Thu Oct 26 20:30:08 2006 --- ./libavcodec/mpeg12.c Sun Nov 12 14:24:27 2006 *************** *** 3106,3112 **** input_size = buf_end - buf_ptr; if(avctx->debug & FF_DEBUG_STARTCODE){ ! av_log(avctx, AV_LOG_DEBUG, "%3X at %zd left %d\n", start_code, buf_ptr-buf, input_size); } /* prepare data for next start code */ --- 3106,3112 ---- input_size = buf_end - buf_ptr; if(avctx->debug & FF_DEBUG_STARTCODE){ ! av_log(avctx, AV_LOG_DEBUG, "%3X at %d left %d\n", start_code, buf_ptr-buf, input_size); } /* prepare data for next start code */ *** ./libavformat/utils.c.uw7 Thu Oct 26 20:30:21 2006 --- ./libavformat/utils.c Sun Nov 12 14:24:27 2006 *************** *** 24,29 **** --- 24,31 ---- #undef NDEBUG #include + #include + #include /** * @file libavformat/utils.c *** ./libavformat/mp3.c.uw7 Thu Oct 26 20:30:21 2006 --- ./libavformat/mp3.c Sun Nov 12 14:24:27 2006 *************** *** 20,25 **** --- 20,27 ---- */ #include "avformat.h" #include "mpegaudio.h" + #include + #include #define ID3_HEADER_SIZE 10 #define ID3_TAG_SIZE 128 *** ./libavformat/rtsp.c.uw7 Thu Oct 26 20:30:22 2006 --- ./libavformat/rtsp.c Sun Nov 12 14:24:27 2006 *************** *** 19,24 **** --- 19,26 ---- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" + #include + #include #include /* for select() prototype */ #include *** ./libavformat/nut.c.uw7 Thu Oct 26 20:30:21 2006 --- ./libavformat/nut.c Sun Nov 12 14:24:27 2006 *************** *** 1040,1046 **** if(!id) break; else if(id >= sizeof(info_table)/sizeof(info_table[0])){ ! av_log(s, AV_LOG_ERROR, "info id is too large %d %zd\n", id, sizeof(info_table)/sizeof(info_table[0])); return -1; } --- 1040,1046 ---- if(!id) break; else if(id >= sizeof(info_table)/sizeof(info_table[0])){ ! av_log(s, AV_LOG_ERROR, "info id is too large %d %d\n", id, sizeof(info_table)/sizeof(info_table[0])); return -1; } *** ./libavformat/matroska.c.uw7 Thu Oct 26 20:30:21 2006 --- ./libavformat/matroska.c Sun Nov 12 14:24:27 2006 *************** *** 905,911 **** return res; if (num > sizeof(uint64_t)) { av_log(matroska->ctx, AV_LOG_ERROR, ! "Integers of size %"PRIu64" (> %zd) not supported\n", num, sizeof(uint64_t)); return AVERROR_INVALIDDATA; } --- 905,911 ---- return res; if (num > sizeof(uint64_t)) { av_log(matroska->ctx, AV_LOG_ERROR, ! "Integers of size %"PRIu64" (> %d) not supported\n", num, sizeof(uint64_t)); return AVERROR_INVALIDDATA; } *************** *** 920,926 **** return res; if (num > sizeof(uint32_t)) { av_log(matroska->ctx, AV_LOG_ERROR, ! "IDs of size %"PRIu64" (> %zu) not supported\n", num, sizeof(uint32_t)); return AVERROR_INVALIDDATA; } --- 920,926 ---- return res; if (num > sizeof(uint32_t)) { av_log(matroska->ctx, AV_LOG_ERROR, ! "IDs of size %"PRIu64" (> %u) not supported\n", num, sizeof(uint32_t)); return AVERROR_INVALIDDATA; } *** ./Configure-UW7.uw7 Sun Nov 12 14:24:27 2006 --- ./Configure-UW7 Sun Nov 12 14:24:45 2006 *************** *** 0 **** --- 1,24 ---- + #!/bin/sh + # + HOST=i586-sco-sysv5 + #CFLAGS="-O2" + CFLAGS="" + INSTALL=/usr/ucb/install + NM="nm -p" + M4=/usr/gnu/bin/m4 + if [ "$1" = "-g" ] + then + CC="gcc -D_REENTRANT" + CXX="g++ -D_REENTRANT" + CFLAGS="$CFLAGS -Wall" + else + CC="cc -Kpthread -Kalloca" + CXX="CC -Kpthread -Kalloca" + fi + export CC CXX CFLAGS NM M4 INSTALL + MMX=--disable-mmx + #MMX= + rm -f mout-configure + ./configure --prefix=/usr --disable-v4l --disable-bktr --disable-dv1394 \ + $MMX --enable-gpl --enable-pp 2>&1 \ + | tee mout-configure *** ./Makefile.uw7 Thu Oct 26 20:30:22 2006 --- ./Makefile Sun Nov 12 14:24:27 2006 *************** *** 37,42 **** --- 37,44 ---- EXTRALIBS+=-lmedia -lbe endif + EXTRALIBS+=-lsocket -lnsl + ifeq ($(BUILD_SHARED),yes) DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) else *************** *** 211,218 **** $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend .libs: lib ! @test -f .libs || touch .libs ! @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done clean: $(MAKE) -C libavutil clean --- 213,219 ---- $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend .libs: lib ! @touch .libs clean: $(MAKE) -C libavutil clean *** ./Install-UW7.uw7 Sun Nov 12 14:24:27 2006 --- ./Install-UW7 Sun Nov 12 14:24:28 2006 *************** *** 0 **** --- 1,14 ---- + #!/bin/sh + + MOUT=mout-install + MOUTLIB=mout-installlib + D=/u/tmp/ffmpeg + DESTDIR=$D + export DESTDIR + + [ -f $MOUT ] && mv $MOUT $MOUT-prev + [ -f $MOUTLIB ] && mv $MOUTLIB $MOUTLIB-prev + [ -d $D ] && rm -rf $D + mkdir -p $D + make install DESTDIR=$D 2>&1 | tee $MOUT + *** ./configure.uw7 Thu Oct 26 20:30:22 2006 --- ./configure Sun Nov 12 14:24:28 2006 *************** *** 1,4 **** ! #!/bin/sh # # ffmpeg configure script (c) 2000, 2001, 2002 Fabrice Bellard # --- 1,4 ---- ! #!/bin/bash # # ffmpeg configure script (c) 2000, 2001, 2002 Fabrice Bellard # *************** *** 129,135 **** log_file(){ log BEGIN $1 ! cat -n $1 >>$logfile log END $1 } --- 129,135 ---- log_file(){ log BEGIN $1 ! cat $1 >>$logfile log END $1 } *************** *** 450,456 **** dlfcn="no" dlopen="no" mpegaudio_hp="yes" ! SHFLAGS='-shared -Wl,-soname,$@' VHOOKSHFLAGS='$(SHFLAGS)' netserver="no" need_inet_aton="no" --- 450,456 ---- dlfcn="no" dlopen="no" mpegaudio_hp="yes" ! SHFLAGS='-shared -Wl,-h,$@' VHOOKSHFLAGS='$(SHFLAGS)' netserver="no" need_inet_aton="no" *************** *** 458,465 **** ffserver="yes" ffplay="yes" LIBOBJFLAGS="" ! FFLDFLAGS=-Wl,--warn-common ! FFSERVERLDFLAGS=-Wl,-E LDCONFIG="ldconfig" LIBPREF="lib" LIBSUF=".a" --- 458,465 ---- ffserver="yes" ffplay="yes" LIBOBJFLAGS="" ! FFLDFLAGS= ! FFSERVERLDFLAGS=-Wl,-Bexport LDCONFIG="ldconfig" LIBPREF="lib" LIBSUF=".a" *************** *** 1407,1414 **** fi if enabled vhook; then ! check_ldflags -rdynamic ! check_ldflags -export-dynamic fi ########################################## --- 1407,1413 ---- fi if enabled vhook; then ! check_ldflags -Wl,-Bexport fi ########################################## *************** *** 1528,1535 **** if test -n "`$cc -v 2>&1 | grep xlc`"; then add_cflags "-O5" add_ldflags "-O5" - else - add_cflags "-O3" fi fi --- 1527,1532 ---- *** ./ffserver.c.uw7 Thu Oct 26 20:30:22 2006 --- ./ffserver.c Sun Nov 12 14:24:28 2006 *************** *** 20,25 **** --- 20,27 ---- */ #define HAVE_AV_CONFIG_H #include "avformat.h" + #include + #include #include #include