diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index e97d3bf9bcb..e65822f2b48 100644 --- a/graphics/ffmpeg/Makefile +++ b/graphics/ffmpeg/Makefile @@ -1,22 +1,21 @@ -# $OpenBSD: Makefile,v 1.96 2013/03/11 11:10:52 espie Exp $ +# $OpenBSD: Makefile,v 1.97 2013/03/13 02:26:44 brad Exp $ COMMENT= audio/video converter and streamer -V= 20121026 +V= 20130214 DISTNAME= ffmpeg-git-${V} PKGNAME= ffmpeg-${V} -REVISION= 2 CATEGORIES= graphics multimedia MASTER_SITES= http://comstyle.com/source/ EXTRACT_SUFX= .tar.xz -SHARED_LIBS= avcodec 18.0 \ - avdevice 6.0 \ - avfilter 4.0 \ - avformat 16.0 \ - avutil 10.0 \ - postproc 15.0 \ - swresample 0.0 \ +SHARED_LIBS= avcodec 19.0 \ + avdevice 7.0 \ + avfilter 5.0 \ + avformat 17.0 \ + avutil 11.0 \ + postproc 15.1 \ + swresample 0.1 \ swscale 5.0 HOMEPAGE= http://ffmpeg.org/ @@ -27,9 +26,9 @@ MAINTAINER= Brad Smith PERMIT_PACKAGE_CDROM= patents PERMIT_PACKAGE_FTP= Yes -WANTLIB= SDL X11 Xext Xfixes bz2 c crypto gsm m mp3lame pthread \ - schroedinger-1.0>=2 sndio speex ssl theoradec theoraenc \ - vorbis vorbisenc vpx x264>=8 xvidcore z +WANTLIB= SDL X11 Xext Xfixes bz2 c crypto gsm m mp3lame opus \ + pthread schroedinger-1.0>=2 sndio speex ssl theoradec \ + theoraenc vorbis vorbisenc vpx x264>=8 xvidcore z BUILD_DEPENDS= textproc/texi2html .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" @@ -38,6 +37,7 @@ BUILD_DEPENDS+= devel/yasm LIB_DEPENDS= archivers/bzip2 \ audio/lame \ audio/libvorbis \ + audio/opus \ audio/speex \ audio/gsm \ devel/sdl \ @@ -48,7 +48,7 @@ LIB_DEPENDS= archivers/bzip2 \ multimedia/xvidcore # inter-library dependencies for the current configuration -LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread +LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lsndio LIBavfilter_EXTRALIBS= LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lssl -lcrypto -pthread @@ -81,17 +81,20 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-armv5te \ --disable-armv6 \ --disable-armv6t2 \ - --disable-armvfp \ --disable-debug \ --disable-indev=jack \ --disable-indev=oss \ - --disable-iwmmxt \ + --disable-mips32r2 \ + --disable-mipsdspr1 \ + --disable-mipsdspr2 \ --disable-neon \ --disable-outdev=oss \ --disable-outdev=sdl \ + --disable-vfp \ --enable-gpl \ --enable-libgsm \ --enable-libmp3lame \ + --enable-libopus \ --enable-libschroedinger \ --enable-libspeex \ --enable-libtheora \ @@ -101,7 +104,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --enable-libxvid \ --enable-nonfree \ --enable-openssl \ - --enable-runtime-cpudetect \ --enable-x11grab \ --extra-cflags="-I${LOCALBASE}/include -I${X11BASE}/include" \ --extra-libs="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ @@ -124,9 +126,9 @@ CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \ LIBpostproc_LINKFLAGS="" \ LIBswresample_LINKFLAGS="" \ LIBswscale_LINKFLAGS="" \ - LIBavcodec_REQUIRES="libavutil schroedinger-1.0 speex theoraenc vpx x264" \ - LIBavdevice_REQUIRES="libavformat libavcodec libavfilter libavutil" \ - LIBavfilter_REQUIRES="libavformat libavcodec libavutil libswresample libswscale" \ + LIBavcodec_REQUIRES="libavutil opus schroedinger-1.0 speex theoraenc vpx x264" \ + LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil" \ + LIBavfilter_REQUIRES="libavcodec libavformat libavutil libpostproc libswresample libswscale" \ LIBavformat_REQUIRES="libavcodec libavutil" \ LIBavutil_REQUIRES="" \ LIBpostproc_REQUIRES="libavutil" \ @@ -147,8 +149,8 @@ MAKE_ENV= V=1 MAKE_FLAGS= ${VERSION_FLAGS} \ LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \ - LIBavdevice_EXTRALIBS="-lavformat -lavcodec -lavfilter -lavutil ${LIBavdevice_EXTRALIBS}" \ - LIBavfilter_EXTRALIBS="-lavformat -lavcodec -lavutil -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \ + LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil ${LIBavdevice_EXTRALIBS}" \ + LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavutil -lpostproc -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \ LIBavformat_EXTRALIBS="-lavcodec -lavutil ${LIBavformat_EXTRALIBS}" \ LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \ LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \ diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index 84b3a0393ef..88ceae05b70 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-git-20121026.tar.xz) = Zc9RhptNJ5f9p8Phj/H4arg9D3qeYiy64Ogg0HPNrFI= -SIZE (ffmpeg-git-20121026.tar.xz) = 4726816 +SHA256 (ffmpeg-git-20130214.tar.xz) = sFGIfgVnojTRenPpuOhUZk+SdtD3rQ3K019lZEmukO4= +SIZE (ffmpeg-git-20130214.tar.xz) = 4798676 diff --git a/graphics/ffmpeg/patches/patch-configure b/graphics/ffmpeg/patches/patch-configure index 9d51567e75d..25bddceaf44 100644 --- a/graphics/ffmpeg/patches/patch-configure +++ b/graphics/ffmpeg/patches/patch-configure @@ -1,15 +1,15 @@ -$OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $ ---- configure.orig Tue Sep 18 22:44:40 2012 -+++ configure Thu Jan 24 16:11:00 2013 -@@ -1185,6 +1185,7 @@ HAVE_LIST=" - GetProcessTimes - getrusage +$OpenBSD: patch-configure,v 1.35 2013/03/13 02:26:45 brad Exp $ +--- configure.orig Thu Feb 14 14:58:57 2013 ++++ configure Thu Feb 14 15:07:02 2013 +@@ -1381,6 +1381,7 @@ HAVE_LIST=" + gettimeofday + glob gnu_as + gsm_h ibm_asm inet_aton - inline_asm -@@ -1205,7 +1206,6 @@ HAVE_LIST=" + io_h +@@ -1398,7 +1399,6 @@ HAVE_LIST=" machine_ioctl_bt848_h machine_ioctl_meteor_h makeinfo @@ -17,15 +17,7 @@ $OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $ MapViewOfFile memalign mkstemp -@@ -2618,6 +2618,7 @@ case $target_os in - enable pic - disable symver - SHFLAGS='-shared' -+ SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)' - oss_indev_extralibs="-lossaudio" - oss_outdev_extralibs="-lossaudio" - ;; -@@ -2800,7 +2801,7 @@ die_license_disabled version3 libvo_amrwbenc +@@ -3435,7 +3435,7 @@ die_license_disabled version3 libvo_amrwbenc enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } @@ -34,34 +26,34 @@ $OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $ enable_pic() { enable pic -@@ -3138,7 +3139,9 @@ enabled libdirac && require_pkg_config dirac - "dirac_decoder_init dirac_encoder_init" - enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +@@ -3828,7 +3828,9 @@ enabled libfdk_aac && require libfdk_aac fdk-aac/aace + flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" + enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType -enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm +enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do + check_lib "${gsm_hdr}" gsm_create -lgsm && break; + done || die "ERROR: libgsm not found"; } + enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame - enabled libnut && require libnut libnut.h nut_demuxer_init -lnut -@@ -3291,7 +3294,6 @@ enabled extra_warnings && check_cflags -Winline +@@ -4001,7 +4003,6 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common - check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil + check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample -test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic - echo "X{};" > $TMPV - if test_ldflags -Wl,--version-script,$TMPV; then -@@ -3714,6 +3716,7 @@ comment=$2 - version=$3 - libs=$4 - requires=$5 -+linkflags=$6 - enabled ${name#lib} || return 0 - mkdir -p $name - cat < $name/$name.pc -@@ -3728,7 +3731,7 @@ Version: $version + enabled xmm_clobber_test && + check_ldflags -Wl,--wrap,avcodec_open2 \ +@@ -4507,6 +4508,7 @@ pkgconfig_generate(){ + version=$3 + libs=$4 + requires=$5 ++ linkflags=$6 + enabled ${name#lib} || return 0 + mkdir -p $name + cat < $name/$name.pc +@@ -4521,7 +4523,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: @@ -70,23 +62,27 @@ $OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $ Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -@@ -3748,11 +3751,11 @@ Cflags: -I\${includedir} - EOF - } +@@ -4557,15 +4559,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, } + libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION" + enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION," -pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" --pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" --pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" +-pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps" +-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps" -pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS" +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS" +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" "$LIBavformat_LINKFLAGS" +pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "$LIBavdevice_REQUIRES" "$LIBavdevice_LINKFLAGS" +pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "$LIBavfilter_REQUIRES" "$LIBavfilter_LINKFLAGS" +pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "$LIBpostproc_REQUIRES" "$LIBpostproc_LINKFLAGS" + pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" +-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" +-pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "$LIBswscale_REQUIRES" "$LIBswscale_LINKFLAGS" +pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBswresample_EXTRALIBS" "$LIBswresample_REQUIRES" "$LIBswresample_LINKFLAGS" + + fix_ffmpeg_remote(){ + git_remote_from=$1 diff --git a/graphics/ffmpeg/patches/patch-libavcodec_libgsm_c b/graphics/ffmpeg/patches/patch-libavcodec_libgsm_c index d36e1943da8..ab9ec06971f 100644 --- a/graphics/ffmpeg/patches/patch-libavcodec_libgsm_c +++ b/graphics/ffmpeg/patches/patch-libavcodec_libgsm_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-libavcodec_libgsm_c,v 1.3 2013/01/25 09:46:22 brad Exp $ ---- libavcodec/libgsm.c.orig Tue Sep 18 22:44:41 2012 -+++ libavcodec/libgsm.c Thu Jan 24 16:11:40 2013 +$OpenBSD: patch-libavcodec_libgsm_c,v 1.4 2013/03/13 02:26:45 brad Exp $ +--- libavcodec/libgsm.c.orig Sun Jan 13 21:30:13 2013 ++++ libavcodec/libgsm.c Fri Jan 25 04:48:40 2013 @@ -27,7 +27,12 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html @@ -12,5 +12,5 @@ $OpenBSD: patch-libavcodec_libgsm_c,v 1.3 2013/01/25 09:46:22 brad Exp $ #include +#endif - #include "avcodec.h" - #include "gsm.h" + #include "libavutil/channel_layout.h" + #include "libavutil/common.h" diff --git a/graphics/ffmpeg/patches/patch-library_mak b/graphics/ffmpeg/patches/patch-library_mak index ba09536be5b..13535babe85 100644 --- a/graphics/ffmpeg/patches/patch-library_mak +++ b/graphics/ffmpeg/patches/patch-library_mak @@ -1,16 +1,16 @@ -$OpenBSD: patch-library_mak,v 1.1 2013/01/14 02:14:41 brad Exp $ ---- library.mak.orig Thu Sep 13 23:19:10 2012 -+++ library.mak Thu Sep 13 23:23:29 2012 -@@ -42,7 +42,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) +$OpenBSD: patch-library_mak,v 1.2 2013/03/13 02:26:45 brad Exp $ +--- library.mak.orig Sun Jan 13 21:30:15 2013 ++++ library.mak Tue Jan 15 02:04:32 2013 +@@ -53,7 +53,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) -- $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) -+ $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS) +- $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) ++ $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(LIB$(NAME)_EXTRALIBS) $(SLIB_EXTRA_CMD) ifdef SUBDIR -@@ -61,8 +61,6 @@ distclean:: clean +@@ -70,8 +70,6 @@ distclean:: clean install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) $(Q)mkdir -p "$(SHLIBDIR)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" diff --git a/graphics/ffmpeg/pkg/PFRAG.shared b/graphics/ffmpeg/pkg/PFRAG.shared deleted file mode 100644 index bd94f6b1952..00000000000 --- a/graphics/ffmpeg/pkg/PFRAG.shared +++ /dev/null @@ -1,9 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.20 2013/01/14 02:14:41 brad Exp $ -@lib lib/libavcodec.so.${LIBavcodec_VERSION} -@lib lib/libavdevice.so.${LIBavdevice_VERSION} -@lib lib/libavfilter.so.${LIBavfilter_VERSION} -@lib lib/libavformat.so.${LIBavformat_VERSION} -@lib lib/libavutil.so.${LIBavutil_VERSION} -@lib lib/libpostproc.so.${LIBpostproc_VERSION} -@lib lib/libswresample.so.${LIBswresample_VERSION} -@lib lib/libswscale.so.${LIBswscale_VERSION} diff --git a/graphics/ffmpeg/pkg/PLIST b/graphics/ffmpeg/pkg/PLIST index 8ca1f11b031..4f9b244c959 100644 --- a/graphics/ffmpeg/pkg/PLIST +++ b/graphics/ffmpeg/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.23 2013/01/14 02:14:41 brad Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.24 2013/03/13 02:26:45 brad Exp $ @bin bin/ffmpeg @bin bin/ffplay @bin bin/ffprobe @@ -9,7 +8,7 @@ include/libavcodec/ include/libavcodec/avcodec.h include/libavcodec/avfft.h include/libavcodec/dxva2.h -include/libavcodec/opt.h +include/libavcodec/old_codec_ids.h include/libavcodec/vaapi.h include/libavcodec/vda.h include/libavcodec/vdpau.h @@ -17,13 +16,15 @@ include/libavcodec/version.h include/libavcodec/xvmc.h include/libavdevice/ include/libavdevice/avdevice.h +include/libavdevice/version.h include/libavfilter/ +include/libavfilter/asrc_abuffer.h include/libavfilter/avcodec.h include/libavfilter/avfilter.h include/libavfilter/avfiltergraph.h include/libavfilter/buffersink.h +include/libavfilter/buffersrc.h include/libavfilter/version.h -include/libavfilter/vsrc_buffer.h include/libavformat/ include/libavformat/avformat.h include/libavformat/avio.h @@ -32,13 +33,17 @@ include/libavutil/ include/libavutil/adler32.h include/libavutil/aes.h include/libavutil/attributes.h +include/libavutil/audio_fifo.h include/libavutil/audioconvert.h include/libavutil/avassert.h include/libavutil/avconfig.h include/libavutil/avstring.h include/libavutil/avutil.h include/libavutil/base64.h +include/libavutil/blowfish.h +include/libavutil/bprint.h include/libavutil/bswap.h +include/libavutil/channel_layout.h include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h @@ -57,6 +62,7 @@ include/libavutil/lzo.h include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h +include/libavutil/old_pix_fmts.h include/libavutil/opt.h include/libavutil/parseutils.h include/libavutil/pixdesc.h @@ -65,20 +71,36 @@ include/libavutil/random_seed.h include/libavutil/rational.h include/libavutil/samplefmt.h include/libavutil/sha.h +include/libavutil/time.h +include/libavutil/timecode.h +include/libavutil/timestamp.h +include/libavutil/version.h +include/libavutil/xtea.h include/libpostproc/ include/libpostproc/postprocess.h +include/libpostproc/version.h include/libswresample/ include/libswresample/swresample.h +include/libswresample/version.h include/libswscale/ include/libswscale/swscale.h +include/libswscale/version.h lib/libavcodec.a +@lib lib/libavcodec.so.${LIBavcodec_VERSION} lib/libavdevice.a +@lib lib/libavdevice.so.${LIBavdevice_VERSION} lib/libavfilter.a +@lib lib/libavfilter.so.${LIBavfilter_VERSION} lib/libavformat.a +@lib lib/libavformat.so.${LIBavformat_VERSION} lib/libavutil.a +@lib lib/libavutil.so.${LIBavutil_VERSION} lib/libpostproc.a +@lib lib/libpostproc.so.${LIBpostproc_VERSION} lib/libswresample.a +@lib lib/libswresample.so.${LIBswresample_VERSION} lib/libswscale.a +@lib lib/libswscale.so.${LIBswscale_VERSION} lib/pkgconfig/ lib/pkgconfig/libavcodec.pc lib/pkgconfig/libavdevice.pc @@ -88,10 +110,26 @@ lib/pkgconfig/libavutil.pc lib/pkgconfig/libpostproc.pc lib/pkgconfig/libswresample.pc lib/pkgconfig/libswscale.pc +@man man/man1/ffmpeg-bitstream-filters.1 +@man man/man1/ffmpeg-codecs.1 +@man man/man1/ffmpeg-devices.1 +@man man/man1/ffmpeg-filters.1 +@man man/man1/ffmpeg-formats.1 +@man man/man1/ffmpeg-protocols.1 +@man man/man1/ffmpeg-resampler.1 +@man man/man1/ffmpeg-scaler.1 +@man man/man1/ffmpeg-utils.1 @man man/man1/ffmpeg.1 @man man/man1/ffplay.1 @man man/man1/ffprobe.1 @man man/man1/ffserver.1 +man/man1/libavcodec.3 +man/man1/libavdevice.3 +man/man1/libavfilter.3 +man/man1/libavformat.3 +man/man1/libavutil.3 +man/man1/libswresample.3 +man/man1/libswscale.3 share/doc/ffmpeg/ share/doc/ffmpeg/developer.html share/doc/ffmpeg/faq.html @@ -105,6 +143,17 @@ share/doc/pkg-readmes/${FULLPKGNAME} share/examples/ffmpeg/ share/examples/ffmpeg/ffserver.conf share/ffmpeg/ +share/ffmpeg/examples/ +share/ffmpeg/examples/Makefile +share/ffmpeg/examples/README +share/ffmpeg/examples/decoding_encoding.c +share/ffmpeg/examples/demuxing.c +share/ffmpeg/examples/filtering_audio.c +share/ffmpeg/examples/filtering_video.c +share/ffmpeg/examples/metadata.c +share/ffmpeg/examples/muxing.c +share/ffmpeg/examples/resampling_audio.c +share/ffmpeg/examples/scaling_video.c share/ffmpeg/ffprobe.xsd share/ffmpeg/libvpx-1080p.ffpreset share/ffmpeg/libvpx-1080p50_60.ffpreset