svn commit: r512495 - head/multimedia/ffmpeg/files
Jan Beich
jbeich at FreeBSD.org
Sat Sep 21 14:18:40 UTC 2019
Author: jbeich
Date: Sat Sep 21 14:18:40 2019
New Revision: 512495
URL: https://svnweb.freebsd.org/changeset/ports/512495
Log:
multimedia/ffmpeg: replace r495918 with upstream fix
Patch conflict makes it easier to prune on update.
Modified:
head/multimedia/ffmpeg/files/patch-libavcodec_allcodecs.c (contents, props changed)
Modified: head/multimedia/ffmpeg/files/patch-libavcodec_allcodecs.c
==============================================================================
--- head/multimedia/ffmpeg/files/patch-libavcodec_allcodecs.c Sat Sep 21 14:05:18 2019 (r512494)
+++ head/multimedia/ffmpeg/files/patch-libavcodec_allcodecs.c Sat Sep 21 14:18:40 2019 (r512495)
@@ -1,19 +1,20 @@
-- Prefer libdav1d over libaom decoder for AV1 streams
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/dc0806dd2588
--- libavcodec/allcodecs.c.orig 2018-11-05 23:22:25 UTC
+++ libavcodec/allcodecs.c
-@@ -678,13 +678,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
+@@ -679,7 +679,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
extern AVCodec ff_pcm_mulaw_at_decoder;
extern AVCodec ff_qdmc_at_decoder;
extern AVCodec ff_qdm2_at_decoder;
-+extern AVCodec ff_libdav1d_decoder;
- extern AVCodec ff_libaom_av1_decoder;
+-extern AVCodec ff_libaom_av1_decoder;
extern AVCodec ff_libaom_av1_encoder;
extern AVCodec ff_libaribb24_decoder;
extern AVCodec ff_libcelt_decoder;
- extern AVCodec ff_libcodec2_encoder;
- extern AVCodec ff_libcodec2_decoder;
--extern AVCodec ff_libdav1d_decoder;
- extern AVCodec ff_libdavs2_decoder;
- extern AVCodec ff_libfdk_aac_encoder;
- extern AVCodec ff_libfdk_aac_decoder;
+@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder;
+ /* external libraries, that shouldn't be used by default if one of the
+ * above is available */
+ extern AVCodec ff_h263_v4l2m2m_encoder;
++extern AVCodec ff_libaom_av1_decoder;
+ extern AVCodec ff_libopenh264_encoder;
+ extern AVCodec ff_libopenh264_decoder;
+ extern AVCodec ff_h264_amf_encoder;
More information about the svn-ports-all
mailing list