head 1.15; access; symbols pkgsrc-2014Q2:1.14.0.12 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.10 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.8 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.6 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.4 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.2 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.13.0.2 pkgsrc-2012Q4-base:1.13 pkgsrc-2012Q3:1.11.0.10 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.8 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.6 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.2 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.9.0.4 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.2 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.8.0.2 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.7.0.6 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.4 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.2 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.6 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.4 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.2 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.6 pkgsrc-2008Q1:1.5.0.4 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.2 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.15 date 2014.08.11.23.10.51; author wiz; state dead; branches; next 1.14; commitid gwOp7aGgPrCMYZLx; 1.14 date 2013.01.16.20.55.47; author adam; state Exp; branches; next 1.13; 1.13 date 2012.11.08.19.57.29; author adam; state Exp; branches; next 1.12; 1.12 date 2012.10.10.13.33.44; author drochner; state Exp; branches; next 1.11; 1.11 date 2011.09.14.17.21.08; author hans; state Exp; branches; next 1.10; 1.10 date 2011.07.19.19.53.18; author drochner; state Exp; branches; next 1.9; 1.9 date 2011.01.17.16.51.05; author drochner; state Exp; branches; next 1.8; 1.8 date 2010.12.03.12.22.19; author wiz; state Exp; branches; next 1.7; 1.7 date 2010.03.14.21.44.49; author tron; state Exp; branches; next 1.6; 1.6 date 2008.09.07.23.39.38; author ahoka; state dead; branches; next 1.5; 1.5 date 2007.12.22.00.05.25; author joerg; state Exp; branches; next 1.4; 1.4 date 2007.08.02.21.48.34; author dbj; state Exp; branches; next 1.3; 1.3 date 2006.02.16.10.26.30; author abs; state Exp; branches; next 1.2; 1.2 date 2004.05.25.21.49.26; author wiz; state Exp; branches; next 1.1; 1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches; next ; desc @@ 1.15 log @Remove ffplay, ffmpeg; add ffplay1, ffmpeg1 to Makefile. @ text @$NetBSD: patch-ac,v 1.14 2013/01/16 20:55:47 adam Exp $ --- Makefile.orig 2012-09-28 01:37:35.000000000 +0000 +++ Makefile @@@@ -139,8 +139,8 @@@@ install-progs: install-progs-yes $(PROGS install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(Q)mkdir -p "$(DATADIR)/examples" - $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" - $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" + $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)" + $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data @ 1.14 log @Changes 1.1: - stream disposition information printing in ffprobe - filter for loudness analysis following EBU R128 - Opus encoder using libopus - ffprobe -select_streams option - Pinnacle TARGA CineWave YUV16 decoder - TAK demuxer, decoder and parser - DTS-HD demuxer - remove -same_quant, it hasn't worked for years - FFM2 support - X-Face image encoder and decoder - 24-bit FLAC encoding - multi-channel ALAC encoding up to 7.1 - metadata (INFO tag) support in WAV muxer - subtitles raw text decoder - support for building DLLs using MSVC - LVF demuxer - ffescape tool - metadata (info chunk) support in CAF muxer - field filter ported from libmpcodecs - AVR demuxer - geq filter ported from libmpcodecs - remove ffserver daemon mode - AST muxer/demuxer - new expansion syntax for drawtext - BRender PIX image decoder - ffprobe -show_entries option - ffprobe -sections option - ADPCM IMA Dialogic decoder - BRSTM demuxer - animated GIF decoder and demuxer - PVF demuxer - subtitles filter - IRCAM muxer/demuxer - Paris Audio File demuxer - Virtual concatenation demuxer - VobSub demuxer - JSON captions for TED talks decoding support - SOX Resampler support in libswresample - aselect filter - SGI RLE 8-bit decoder - Silicon Graphics Motion Video Compressor 1 & 2 decoder - Silicon Graphics Movie demuxer - apad filter - Resolution & pixel format change support with multithreading for H.264 - documentation split into per-component manuals - pp (postproc) filter ported from MPlayer - NIST Sphere demuxer - MPL2, VPlayer, MPlayer, AQTitle, PJS and SubViewer v1 subtitles demuxers and decoders - Sony Wave64 muxer - adobe and limelight publisher authentication in RTMP - data: URI scheme - support building on the Plan 9 operating system - kerndeint filter ported from MPlayer - histeq filter ported from VirtualDub - Megalux Frame demuxer - 012v decoder - Improved AVC Intra decoding support @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.13 2012/11/08 19:57:29 adam Exp $ @ 1.13 log @Changes 1.0: - INI and flat output in ffprobe - Scene detection in libavfilter - Indeo Audio decoder - channelsplit audio filter - setnsamples audio filter - atempo filter - ffprobe -show_data option - RTMPT protocol support - iLBC encoding/decoding via libilbc - Microsoft Screen 1 decoder - join audio filter - audio channel mapping filter - Microsoft ATC Screen decoder - RTSP listen mode - TechSmith Screen Codec 2 decoder - AAC encoding via libfdk-aac - Microsoft Expression Encoder Screen decoder - RTMPS protocol support - RTMPTS protocol support - RTMPE protocol support - RTMPTE protocol support - showwaves and showspectrum filter - LucasArts SMUSH playback support - SAMI, RealText and SubViewer demuxers and decoders - Heart Of Darkness PAF playback support - iec61883 device - asettb filter - new option: -progress - 3GPP Timed Text encoder/decoder - GeoTIFF decoder support - ffmpeg -(no)stdin option - Opus decoder using libopus - caca output device using libcaca - alphaextract and alphamerge filters - concat filter - flite filter - Canopus Lossless Codec decoder - bitmap subtitles in filters (experimental and temporary) - MP2 encoding via TwoLAME - bmp parser - smptebars source - asetpts filter - hue filter - ICO muxer - SubRip encoder and decoder without embedded timing - edge detection filter - framestep filter - ffmpeg -shortest option is now per-output file -pass and -passlogfile are now per-output stream - volume measurement filter - Ut Video encoder - Microsoft Screen 2 decoder - Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP instead of AV_CODEC_ID_TEXT - smartblur filter ported from MPlayer - CPiA decoder - decimate filter ported from MPlayer - RTP depacketization of JPEG - Smooth Streaming live segmenter muxer - F4V muxer - sendcmd and asendcmd filters - WebVTT demuxer and decoder (simple tags supported) - RTP packetization of JPEG - faststart option in the MOV/MP4 muxer @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -138,8 +138,8 @@@@ install-progs: install-progs-yes $(PROGS @ 1.12 log @copy ffmpeg10 to ffmpeg, making it the default version @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2012/09/14 14:52:35 drochner Exp $ d3 1 a3 1 --- Makefile.orig 2012-06-09 20:09:44.000000000 +0000 d5 1 a5 1 @@@@ -124,7 +124,7 @@@@ install-progs: install-progs-yes $(PROGS d7 2 a8 2 install-data: $(DATA_FILES) $(Q)mkdir -p "$(DATADIR)" d10 1 d12 1 @ 1.11 log @Fix check for texi2html to work with older texi2html versions. While at it, don't build the html documentation that isn't installed anyway. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2011/07/19 19:53:18 drochner Exp $ d3 3 a5 12 --- Makefile.orig 2011-06-21 21:29:25.000000000 +0200 +++ Makefile 2011-09-12 17:54:06.075569882 +0200 @@@@ -112,7 +112,7 @@@@ version.h .version: # force version.sh to run whenever version might have changed -include .version -DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES) +DOCS = $(MANPAGES) $(PODPAGES) documentation: $(DOCS) @@@@ -152,11 +152,11 @@@@ install-progs: install-progs-yes $(PROGS d12 1 a12 6 install-man: $(MANPAGES) $(Q)mkdir -p "$(MANDIR)/man1" - $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" + $(INSTALL) -c -m 644 $(MANPAGES) "$(MANDIR)/man1" uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data uninstall-man @ 1.10 log @update to 0.7.1 changes: many new features and bugfixes (those of the 0.8 branch), but API/ABI compatible with 0.6 @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 2 --- Makefile.orig 2011-06-21 19:29:25.000000000 +0000 +++ Makefile @ 1.9 log @update to 20101018.0.6.1, from Makoto Fujiwara per pkgsrc-wip, with two changes by me: -disabled symbol versioning - this didn't work correctly for me -changed PKGVERSION to start with the release date, so that it sorts correctly against the snapshots we had before vlc-1.0.6 does still build, but can be updated now @ text @d3 3 a5 12 --- Makefile.orig 2010-04-19 22:05:26.000000000 +0900 +++ Makefile 2011-01-05 17:04:14.000000000 +0900 @@@@ -107,7 +107,7 @@@@ doc/%.html: TAG = HTML doc/%.html: doc/%.texi - $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) + $(M)cd doc && texi2html -monolithic -number-sections $(<:doc/%=%) doc/%.pod: TAG = POD doc/%.pod: doc/%-doc.texi @@@@ -125,11 +125,11 @@@@ d17 1 a17 1 uninstall: uninstall-progs uninstall-data uninstall-man @ 1.8 log @Avoid using obsolete texi2html command line flags. Fixes build with texi2html>=5. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2010/03/14 21:44:49 tron Exp $ d3 3 a5 7 Avoid using obsolete texi2html command line flags. Fix installation using the "install-sh" the package. --- Makefile.orig 2009-05-28 22:13:17.000000000 +0000 +++ Makefile @@@@ -80,7 +80,7 @@@@ documentation: $(addprefix doc/, ffmpeg- ffplay-doc.html general.html $(ALLMANPAGES)) d7 1 d9 2 a10 3 - texi2html -monolithic -number $< + texi2html -monolithic -number-sections $< mv $(@@F) $@@ d12 1 d14 1 a14 6 @@@@ -93,15 +93,15 @@@@ install: $(INSTALL_TARGETS-yes) install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) install -d "$(BINDIR)" - install -c -m 755 $(PROGS) "$(BINDIR)" + install -c -c -m 755 $(PROGS) "$(BINDIR)" d17 3 a19 3 install -d "$(DATADIR)" - install -m 644 $(DATA_FILES) "$(DATADIR)" + install -c -m 644 $(DATA_FILES) "$(DATADIR)" d22 3 a24 3 install -d "$(MANDIR)/man1" - install -m 644 $(MANPAGES) "$(MANDIR)/man1" + install -c -m 644 $(MANPAGES) "$(MANDIR)/man1" @ 1.7 log @Fix installation on platforms where the "install-sh" package is used. @ text @d1 1 a1 1 $NetBSD$ d3 1 d6 12 a17 3 --- Makefile.orig Fri May 29 00:13:17 2009 +++ Makefile Sun Mar 14 22:35:24 2010 @@@@ -93,15 +93,15 @@@@ @ 1.6 log @Track FreeBSD's SVN snapshots of ffmpeg as there are no more stable releases produced by the ffmpeg team. Add v4l2 support for NetBSD. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2007/12/22 00:05:25 joerg Exp $ d3 20 a22 113 --- Makefile.orig 2004-07-08 13:02:04.000000000 +0200 +++ Makefile @@@@ -5,9 +5,7 @@@@ include config.mak VPATH=$(SRC_PATH) - -CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -LDFLAGS+= -g +CFLAGS= $(SHCFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ifeq ($(TARGET_GPROF),yes) CFLAGS+=-p @@@@ -46,6 +44,8 @@@@ ifeq ($(CONFIG_VORBIS),yes) EXTRALIBS+=-logg -lvorbis -lvorbisenc endif +EXTRALIBS+=${LIBOSSAUDIO} + ifeq ($(CONFIG_FAAD),yes) ifeq ($(CONFIG_FAADBIN),yes) # no libs needed @@@@ -76,7 +76,7 @@@@ endif OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) @@@@ -84,25 +84,18 @@@@ lib: $(MAKE) -C libavcodec all $(MAKE) -C libavformat all -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) - -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) - cp -p $< $@@ - $(STRIP) $@@ +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) -ffserver$(EXESUF): ffserver.o .libs - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@@ ffserver.o $(FFLIBS) $(EXTRALIBS) +ffserver$(EXESUF): ffserver.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@@ ffserver.o $(FFLIBS) $(EXTRALIBS) -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -ffplay$(EXESUF): ffplay_g$(EXESUF) - cp -p $< $@@ - $(STRIP) $@@ +ffplay$(EXESUF): ffplay.o cmdutils.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -output_example$(EXESUF): output_example.o .libs - $(CC) $(LDFLAGS) -o $@@ output_example.o $(FFLIBS) $(EXTRALIBS) +output_example$(EXESUF): output_example.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ output_example.o $(FFLIBS) $(EXTRALIBS) qt-faststart$(EXESUF): qt-faststart.c $(CC) qt-faststart.c -o qt-faststart$(EXESUF) @@@@ -111,9 +104,9 @@@@ ffplay.o: ffplay.c $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@@ $< %.o: %.c - $(CC) $(CFLAGS) -c -o $@@ $< + $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@@ $< -videohook: .libs +videohook: .ffmpeglibs $(MAKE) -C vhook all documentation: @@@@ -122,10 +115,10 @@@@ documentation: .PHONY: install install: all install-man $(INSTALLVHOOK) - $(MAKE) -C libavcodec install - $(MAKE) -C libavformat install - install -d "$(bindir)" - install -c -s -m 755 $(PROG) "$(bindir)" + $(MAKE) -C libavcodec install install-headers + $(MAKE) -C libavformat install install-headers + install -d "${DESTDIR}$(bindir)" + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(bindir) # create the window installer wininstaller: all install @@@@ -135,8 +128,8 @@@@ wininstaller: all install install-man: ifneq ($(CONFIG_WIN32),yes) if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \ - install -d "$(mandir)/man1" ; \ - install -m 644 $(MANPAGE) "$(mandir)/man1" ; \ + install -d "${DESTDIR}$(mandir)/man1" ; \ + install -m 644 $(MANPAGE) "${DESTDIR}$(mandir)/man1" ; \ fi endif @@@@ -159,15 +152,15 @@@@ endif .depend: $(SRCS) $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 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 +.ffmpeglibs: lib + @@test -f .ffmpeglibs || touch .ffmpeglibs + @@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .ffmpeglibs ; then touch .ffmpeglibs; fi ; done d24 1 a24 6 clean: $(CLEANVHOOK) $(MAKE) -C libavcodec clean $(MAKE) -C libavformat clean $(MAKE) -C tests clean - rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) + rm -f *.o *.d *~ .ffmpeglibs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) a25 2 clean-vhook: $(MAKE) -C vhook clean @ 1.5 log @Linux needs -ldl in all cases (from PR 37587). Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @fixes to compile on darwin @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2006/02/16 10:26:30 abs Exp $ d86 2 d90 2 a91 3 install -d "$(bindir)" - install -c -s -m 755 $(PROG) "$(bindir)" + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) "$(bindir)" d95 11 @ 1.3 log @Update ffmpeg to 0.4.9pre1, and add patch for libavcodec buffer overflow http://secunia.com/advisories/17892/ version 0.4.9-pre1: - DV encoder, DV muxer - Microsoft RLE video decoder - Microsoft Video-1 decoder - Apple Animation (RLE) decoder - Apple Graphics (SMC) decoder - Apple Video (RPZA) decoder - Cinepak decoder - Sega FILM (CPK) file demuxer - Westwood multimedia support (VQA & AUD files) - Id Quake II CIN playback support - 8BPS video decoder - FLIC playback support - RealVideo 2.0 (RV20) decoder - Duck TrueMotion v1 (DUCK) video decoder - Sierra VMD demuxer and video decoder - MSZH and ZLIB decoder support - SVQ1 video encoder - AMR-WB support - PPC optimisations - rate distortion optimal cbp support - rate distorted optimal ac prediction for mpeg4 - rate distorted optimal lambda->qp support - AAC encoding with libfaac - Sunplus JPEG codec (SP5X) support - use lagrange multipler instead of qp for ratecontrol - theora/VP3 decoding support - XA and ADX ADPCM codecs - export mpeg2 active display area / pan scan - Add support for configuring with IBM XLC - floating point AAN DCT - initial support for zygovideo (not complete) - rgb ffv1 support - new audio/video parser API - av_log() system - av_read_frame() and av_seek_frame() support - missing last frame fixes - seek by mouse in ffplay - noise reduction of dct coefficients - h263 OBMC & 4MV support - h263 alternative inter vlc support - h263 loop filter - h263 slice structured mode - interlaced DCT support for MPEG2 encoding - stuffing to stay above min_bitrate - mb type & qp vissualization - frame stepping for ffplay - interlaced motion estimation - alternate scantable support - SVCD scan offset support - closed gop support - SSE2 fdct - quantizer noise shaping - G.726 ADPCM audio codec - MS ADPCM encoding - multithreaded/SMP motion estimation - multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263 - multithreaded/SMP decoding for MPEG2 - FLAC decoder - Metrowerks CodeWarrior suppport - h263+ custom pcf support - nicer output for 'ffmpeg -formats' - matroska demuxer - SGI image format, encoding and decoding - h264 loop filter support - h264 CABAC support - nicer looking arrows for the motion vector vissualization - improved VCD support - audio timestamp drift compensation - mpeg2 YUV 422/444 support - polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample - better image scaling - h261 support - correctly interleave packets during encoding - VIS optimized motion compensation - intra_dc_precission>0 encoding support - support reuse of motion vectors/mb types/field select values of the source video - more accurate deblock filter - padding support - many optimizations and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ d12 1 a12 1 +CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE @ 1.2 log @Update to 0.4.8, and install the header files that are customarily installed. Changes: version 0.4.8: - MPEG2 video encoding (Michael) - Id RoQ playback subsystem (Mike Melanson and Tim Ferguson) - Wing Commander III Movie (.mve) file playback subsystem (Mike Melanson and Mario Brito) - Xan DPCM audio decoder (Mario Brito) - Interplay MVE playback subsystem (Mike Melanson) - Duck DK3 and DK4 ADPCM audio decoders (Mike Melanson) version 0.4.7: - RealAudio 1.0 (14_4) and 2.0 (28_8) native decoders. Author unknown, code from a mplayerhq (originally from public domain player for Amiga at http://www.honeypot.net/audio) - Current version now also compiles with older GCC (Fabrice) - 4X multimedia playback system including 4xm file demuxer (Mike Melanson), and 4X video and audio codecs (Michael) - Creative YUV (CYUV) decoder (Mike Melanson) - FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv) (Michael) - ASV1 (Asus), H.264, Intel indeo3 codecs has been added (Various) - Tiny PNG encoder and decoder, tiny GIF decoder, PAM decoder (PPM with alpha support), JPEG YUV colorspace support. (Fabrice Bellard) - ffplay has been replaced with a newer version which uses SDL (optionally) for multi platform support (fabrice) - Sorenson Version 3 codec (SVQ3) support has been added (decoding only) - donated by anonymous - AMR format has been added (Johannes Carlsson) - 3gp support has been added (Johannes Carlsson) - VP3 codec has been added (Mike Melanson) - more MPEG-1/2 fixes - Better Multi platform support, MS Visual Studio fixes (various) - Altivec optimizations (Magnus Damn and others) - SH4 processor support has been added (BERO) - New public interfaces (avcodec_get_pix_fmt) (Roman Shaposhnick) - VOB Streaming support (Brian Foley) - Better MP3 Autodetection (Andriy Rysin) - qpel encoding (Michael) - 4mv+b frames encoding finally fixed (Michael) - chroma ME (Michael) - 5 comparission functions for ME (Michael) - b frame encoding speedup (Michael) - wmv2 codec (unfinished - Michael) - user specified diamond size for EPZS (Michael) - Playstation STR playback subsystem, still experimental (Mike and Michael) - ASV2 codec (Michael) - CLJR decoder (Alex) .. And lots more new enhances and fixes. version 0.4.6: - completely new integer only mpeg audio layer 1/2/3 decoder rewritten from scratch. - recoded dct and motion vector search with gcc (no longer depends on nasm). - fix quantization bug in AC3 encoder. - added PCM codecs and format. Corrected wav/avi/asf pcm issues. - added prototype ffplay program. - added GOB header parsing on H.263/H.263+ decoder. (Juanjo) - bug fix on MCBPC tables of H.263. (Juanjo) - bug fix on DC coefficients of H.263. (Juanjo) - added Advanced Prediction Mode on H.263/H.263+ decoder. (Juanjo) - now we can decode H.263 streams found on QuickTime files. (Juanjo) - now we can decode H.263 streams found on VIVO v1 files.(Juanjo) - preliminary RTP "friendly" mode for H.263/H.263+ coding. (Juanjo) - added GOB header for H.263/H.263+ coding on RTP mode. (Juanjo) - now H.263 picture size is returned on the first decoded frame. (Juanjo) - added first regression tests - added MPEG2 TS demux - new demux API for libav - more accurate and faster IDCT (Michael) - faster and entropy controlled motion search (Michael) - two pass video encoding (Michael) - new video rate control (Michael) - added MSMPEG4V1, MSMPEGV2 and WMV1 support (Michael) - great performance improvement of video encoders and decoders (Michael) - new and faster bit readers and vlc parsers (Michael) - high quality encoding mode : tries all macroblock/VLC types (Michael) - added DV video decoder - preliminary RTP/RTSP support in ffserver and libavformat - H.263+ AIC decoding/encoding support. (Juanjo) - VCD MPEG-PS mode. (Juanjo) - PSNR stuff. (Juanjo) - Simple stats output. (Juanjo) - 16-bit and 15-bit rgb/bgr/gbr support (Bisqwit) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2003-09-28 17:26:39.000000000 +0200 d5 2 a6 1 @@@@ -6,8 +6,7 @@@@ include config.mak d9 2 a10 2 -CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE d16 1 a16 1 @@@@ -42,6 +41,8 @@@@ ifeq ($(CONFIG_VORBIS),yes) d25 1 a25 1 @@@@ -64,7 +65,7 @@@@ endif d32 1 a32 1 all: lib $(PROG) $(PROGTEST) $(VHOOK) d34 1 a34 1 @@@@ -72,42 +73,34 @@@@ lib: d44 3 a46 1 - d49 2 a50 2 +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) a53 2 +ffserver$(EXESUF): ffserver.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@@ ffserver.o $(FFLIBS) $(EXTRALIBS) d66 3 a68 1 ffplay.o: ffplay.c d79 2 d94 1 a94 1 @@@@ -145,15 +138,15 @@@@ endif d96 1 a96 1 $(CC) -MM $(CFLAGS) $^ 1>.depend @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2002/03/22 11:59:19 tron Exp $ d3 10 a12 10 --- Makefile.orig Wed Aug 15 15:12:07 2001 +++ Makefile Fri Mar 22 12:43:45 2002 @@@@ -3,8 +3,8 @@@@ # include config.mak -CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav -LDFLAGS= -g +CFLAGS= $(OPTFLAGS) -Wall -I./libavcodec -I./libav -I$(LOCALBASE)/include +LDFLAGS= -L$(LOCALBASE)/lib d15 19 a33 2 LDFLAGS+=-p @@@@ -18,17 +18,19 @@@@ d35 1 a35 1 $(MAKE) -C libav all d37 30 a66 9 -ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a - gcc $(LDFLAGS) -o $@@ $^ -lm +ffmpeg: ffmpeg.o libav/libav.la libavcodec/libavcodec.la + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ $^ -lm -ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a - gcc $(LDFLAGS) -o $@@ $^ -lm +ffserver: ffserver.o libav/libav.la libavcodec/libavcodec.la + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ $^ -lm $(EXTRA_LIBS) d69 2 a70 2 - gcc $(CFLAGS) -c -o $@@ $< + $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@@ $< d72 27 a98 5 install: all - install -s -m 755 $(PROG) $(prefix)/bin + $(MAKE) -C libavcodec install + $(MAKE) -C libav install + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin d100 1 a100 1 clean: d102 7 @ 1.1.1.1 log @Reimport graphics/ffmpeg as multimedia/ffmpeg. @ text @@