October 2005 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavcodec Makefile,1.202,1.203
by diego＠mplayerhq.hu 04 Oct '05

04 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv15240/libavcodec Modified Files: Makefile Log Message: Move all definitions of external dependencies into configure instead of defining it in configure and the Makefiles in a random fashion. patch by j -- at -- v2v -- dot -- cc Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.202 retrieving revision 1.203 diff -u -d -r1.202 -r1.203 --- Makefile 26 Sep 2005 10:05:13 -0000 1.202 +++ Makefile 4 Oct 2005 11:19:07 -0000 1.203 @@ -240,32 +240,22 @@ # currently using libdts for dts decoding ifeq ($(CONFIG_DTS),yes) OBJS+= dtsdec.o -CFLAGS += $(DTS_INC) -EXTRALIBS += -ldts endif ifeq ($(CONFIG_FAAD),yes) OBJS+= faad.o -ifeq ($(CONFIG_FAADBIN),yes) -# no libs needed -else -EXTRALIBS += -lfaad -endif endif ifeq ($(CONFIG_FAAC),yes) OBJS+= faac.o -EXTRALIBS += -lfaac endif ifeq ($(CONFIG_XVID),yes) OBJS+= xvidff.o -EXTRALIBS += -lxvidcore endif ifeq ($(CONFIG_X264),yes) OBJS+= x264.o -EXTRALIBS += -lx264 endif ifeq ($(CONFIG_PP),yes) @@ -279,24 +269,19 @@ ifeq ($(CONFIG_MP3LAME),yes) OBJS += mp3lameaudio.o -EXTRALIBS += -lmp3lame endif ifeq ($(CONFIG_LIBOGG),yes) ifeq ($(CONFIG_LIBVORBIS),yes) OBJS += oggvorbis.o -EXTRALIBS += -lvorbisenc -lvorbis endif ifeq ($(CONFIG_LIBTHEORA), yes) OBJS += oggtheora.o -EXTRALIBS += -ltheora endif -EXTRALIBS += -logg endif ifeq ($(CONFIG_LIBGSM),yes) OBJS += libgsm.o -EXTRALIBS += -lgsm endif ifeq ($(TARGET_GPROF),yes)

1 0

CVS: ffmpeg/libavformat Makefile,1.100,1.101
by diego＠mplayerhq.hu 04 Oct '05

04 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv15240/libavformat Modified Files: Makefile Log Message: Move all definitions of external dependencies into configure instead of defining it in configure and the Makefiles in a random fashion. patch by j -- at -- v2v -- dot -- cc Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- Makefile 26 Sep 2005 10:05:13 -0000 1.100 +++ Makefile 4 Oct 2005 11:19:08 -0000 1.101 @@ -60,7 +60,6 @@ ifeq ($(CONFIG_AUDIO_BEOS),yes) PPOBJS+= beosaudio.o -EXTRALIBS+=-lbe -lmedia endif ifeq ($(CONFIG_NETWORK),yes) @@ -86,9 +85,6 @@ ifeq ($(CONFIG_DARWIN),yes) SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) endif -ifeq ($(CONFIG_MP3LAME),yes) -AVCLIBS+=-lmp3lame -endif endif SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)

1 0

CVS: ffmpeg configure, 1.209, 1.210 Makefile, 1.83, 1.84
by diego＠mplayerhq.hu 04 Oct '05

04 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv15240 Modified Files: configure Makefile Log Message: Move all definitions of external dependencies into configure instead of defining it in configure and the Makefiles in a random fashion. patch by j -- at -- v2v -- dot -- cc Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -r1.209 -r1.210 --- configure 3 Oct 2005 08:15:48 -0000 1.209 +++ configure 4 Oct 2005 11:19:07 -0000 1.210 @@ -375,6 +375,7 @@ SLIBSUF=".dll" EXESUF=".exe" extralibs="" +pkg_requires="" v4l="no" audio_oss="no" dv1394="no" @@ -470,6 +471,7 @@ --disable-audio-oss) audio_oss="no" ;; --disable-audio-beos) audio_beos="no" + extralibs="$extralibs -lbe -lmedia" ;; --disable-dv1394) dv1394="no" ;; @@ -481,33 +483,48 @@ ;; --enable-a52bin) a52bin="yes" ;; - --enable-dts) dts="yes" ; extralibs="$extralibs -ldts" + --enable-dts) dts="yes" + extralibs="$extralibs -ldts" ;; --enable-pp) pp="yes" ;; --enable-shared-pp) shared_pp="yes" ;; --enable-libgsm) libgsm="yes" + extralibs="$extralibs -lgsm" ;; - --enable-mp3lame) mp3lame="yes"; extralibs="$extralibs -lmp3lame" + --enable-mp3lame) mp3lame="yes" + extralibs="$extralibs -lmp3lame" ;; --enable-libogg) libogg="yes" + extralibs="$extralibs -logg" + pkg_requires="$pkg_requires ogg >= 1.1" ;; --enable-vorbis) vorbis="yes" + extralibs="$extralibs -lvorbis -lvorbisenc" + pkg_requires="$pkg_requires vorbis vorbisenc" ;; --enable-theora) theora="yes" + extralibs="$extralibs -ltheora" + pkg_requires="$pkg_requires theora" ;; --enable-faad) faad="yes" + extralibs="$extralibs -lfaad" ;; --enable-faadbin) faadbin="yes" ;; - --enable-faac) faac="yes"; extralibs="$extralibs -lfaac" + --enable-faac) faac="yes" + extralibs="$extralibs -lfaac" ;; --enable-xvid) xvid="yes" + extralibs="$extralibs -lxvidcore" ;; - --enable-x264) x264="yes"; extralibs="$extralibs -lx264" + --enable-x264) x264="yes" + extralibs="$extralibs -lx264" ;; --enable-dc1394) dc1394="yes" + extralibs="$extralibs -ldc1394_control -lraw1394" + pkg_requires="$pkg_requires libraw1394" ;; --disable-vhook) vhook="no" ;; @@ -1772,17 +1789,6 @@ lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'` lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'` -requires= -test "$dc1394" = "yes" && extralibs="$extralibs -ldc1394_control" && requires="$requires libraw1394" -test "$libgsm" = "yes" && extralibs="$extralibs -lgsm" -test "$libogg" = "yes" && requires="$requires ogg >= 1.1" -test "$vorbis" = "yes" && requires="$requires vorbis" -test "$mp3lame" = "yes" && extralibs="$extralibs -lmp3lame" -test "$theora" = "yes" && requires="$requires theora" -test "$faad" = "yes" && test "$faadbin" = "no" && extralibs="$extralibs -lfaad" -test "$faac" = "yes" && extralibs="$extralibs -lfaac" -test "$xvid" = "yes" && extralibs="$extralibs -lxvidcore" - # libavutil.pc cat <<EOF >libavutil.pc prefix=$prefix @@ -1824,7 +1830,7 @@ Name: libavcodec Description: FFmpeg codec library Version: $lavc_version -Requires: $requires libavutil = $lavu_version +Requires: $pkg_requires libavutil = $lavu_version Conflicts: Libs: -L\${libdir} -lavcodec $extralibs Cflags: -I\${includedir} -I\${includedir}/ffmpeg @@ -1839,7 +1845,7 @@ Name: libavcodec Description: FFmpeg codec library Version: $lavc_version -Requires: $requires libavutil = $lavu_version +Requires: $pkg_requires libavutil = $lavu_version Conflicts: Libs: \${libdir}/${LIBPREF}avcodec${LIBSUF} $extralibs Cflags: -I\${includedir} @@ -1855,7 +1861,7 @@ Name: libavformat Description: FFmpeg container format library Version: $lavf_version -Requires: $requires libavcodec = $lavc_version +Requires: $pkg_requires libavcodec = $lavc_version Conflicts: Libs: -L\${libdir} -lavformat $extralibs Cflags: -I\${includedir} -I\${includedir}/ffmpeg @@ -1870,7 +1876,7 @@ Name: libavformat Description: FFmpeg container format library Version: $lavf_version -Requires: $requires libavcodec = $lavc_version +Requires: $pkg_requires libavcodec = $lavc_version Conflicts: Libs: \${libdir}/${LIBPREF}avformat${LIBSUF} $extralibs Cflags: -I\${includedir} Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- Makefile 10 Aug 2005 08:49:10 -0000 1.83 +++ Makefile 4 Oct 2005 11:19:07 -0000 1.84 @@ -38,43 +38,6 @@ DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) else DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) -ifeq ($(CONFIG_MP3LAME),yes) -EXTRALIBS+=-lmp3lame -endif -endif - -ifeq ($(CONFIG_LIBOGG),yes) -ifeq ($(CONFIG_LIBVORBIS),yes) -EXTRALIBS+= -lvorbisenc -lvorbis -endif -ifeq ($(CONFIG_LIBTHEORA),yes) -EXTRALIBS+= -ltheora -endif -EXTRALIBS+= -logg -endif - -ifeq ($(CONFIG_FAAD),yes) -ifeq ($(CONFIG_FAADBIN),yes) -# no libs needed -else -EXTRALIBS += -lfaad -endif -endif - -ifeq ($(CONFIG_FAAC),yes) -EXTRALIBS+=-lfaac -endif - -ifeq ($(CONFIG_XVID),yes) -EXTRALIBS+=-lxvidcore -endif - -ifeq ($(CONFIG_LIBGSM),yes) -EXTRALIBS+=-lgsm -endif - -ifeq ($(CONFIG_DC1394),yes) -EXTRALIBS+=-ldc1394_control -lraw1394 endif ifeq ($(BUILD_VHOOK),yes)

1 0

CVS: ffmpeg configure,1.208,1.209
by mru＠mplayerhq.hu 03 Oct '05

03 Oct '05

1 0

CVS: ffmpeg configure,1.207,1.208
by diego＠mplayerhq.hu 02 Oct '05

02 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv32111 Modified Files: configure Log Message: Add all possible shared libraries to the pkg-config files. patch by j -- at -- v2v -- dot -- cc Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.207 retrieving revision 1.208 diff -u -d -r1.207 -r1.208 --- configure 2 Oct 2005 15:47:08 -0000 1.207 +++ configure 2 Oct 2005 16:12:03 -0000 1.208 @@ -1773,10 +1773,15 @@ lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'` requires= +test "$dc1394" = "yes" && extralibs="$extralibs -ldc1394_control" && requires="$requires libraw1394" +test "$libgsm" = "yes" && extralibs="$extralibs -lgsm" test "$libogg" = "yes" && requires="$requires ogg >= 1.1" test "$vorbis" = "yes" && requires="$requires vorbis" +test "$mp3lame" = "yes" && extralibs="$extralibs -lmp3lame" test "$theora" = "yes" && requires="$requires theora" test "$faad" = "yes" && test "$faadbin" = "no" && extralibs="$extralibs -lfaad" +test "$faac" = "yes" && extralibs="$extralibs -lfaac" +test "$xvid" = "yes" && extralibs="$extralibs -lxvidcore" # libavutil.pc cat <<EOF >libavutil.pc

1 0

CVS: ffmpeg configure,1.206,1.207
by diego＠mplayerhq.hu 02 Oct '05

02 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv10213 Modified Files: configure Log Message: Add the flags for faac and mp3lame to $extralibs in configure, so they are reported in the pkg-config of libavcodec. patch by Derk-Jan Hartman <d.hartman - at - student - dot - utwente - dot - nl> Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.206 retrieving revision 1.207 diff -u -d -r1.206 -r1.207 --- configure 27 Sep 2005 08:35:12 -0000 1.206 +++ configure 2 Oct 2005 15:47:08 -0000 1.207 @@ -489,7 +489,7 @@ ;; --enable-libgsm) libgsm="yes" ;; - --enable-mp3lame) mp3lame="yes" + --enable-mp3lame) mp3lame="yes"; extralibs="$extralibs -lmp3lame" ;; --enable-libogg) libogg="yes" ;; @@ -501,7 +501,7 @@ ;; --enable-faadbin) faadbin="yes" ;; - --enable-faac) faac="yes" + --enable-faac) faac="yes"; extralibs="$extralibs -lfaac" ;; --enable-xvid) xvid="yes" ;;

1 0

CVS: ffmpeg/vhook Makefile,1.23,1.24
by diego＠mplayerhq.hu 01 Oct '05

01 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/vhook In directory mail:/var2/tmp/cvs-serv18379/vhook Modified Files: Makefile Log Message: vhoook vs vhook typo, patch by Steven M. Schultz < sms - at - 2BSD - at - COM > Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 26 Sep 2005 10:05:13 -0000 1.23 +++ Makefile 1 Oct 2005 14:21:34 -0000 1.24 @@ -37,7 +37,7 @@ %$(SLIBSUF): %.o ifeq ($(CONFIG_DARWIN),yes) - $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhoook/$@ -g -o $@ $< + $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhook/$@ -g -o $@ $< else $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< endif

1 0

CVS: ffmpeg/libavformat utils.c,1.160,1.161
by michael＠mplayerhq.hu 01 Oct '05

01 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv16066 Modified Files: utils.c Log Message: a few checks, seems i forgot to commit this Index: utils.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- utils.c 14 Aug 2005 15:42:40 -0000 1.160 +++ utils.c 14 Aug 2005 16:19:20 -0000 1.161 @@ -2158,6 +2158,30 @@ int ret, i; AVStream *st; + // some sanity checks + for(i=0;i<s->nb_streams;i++) { + st = s->streams[i]; + + switch (st->codec->codec_type) { + case CODEC_TYPE_AUDIO: + if(st->codec->sample_rate<=0){ + av_log(s, AV_LOG_ERROR, "sample rate not set\n"); + return -1; + } + break; + case CODEC_TYPE_VIDEO: + if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too? + av_log(s, AV_LOG_ERROR, "time base not set\n"); + return -1; + } + if(st->codec->width<=0 || st->codec->height<=0){ + av_log(s, AV_LOG_ERROR, "dimensions not set\n"); + return -1; + } + break; + } + } + ret = s->oformat->write_header(s); if (ret < 0) return ret;

2 1