Skip to content

Commit 5d76d08

Browse files
committed
projects: Update for recent upstream merge.
1 parent 4a96339 commit 5d76d08

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

SMP/SMP.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
2-
index 4b905bf9da..c3346ac857 100644
2+
index 9afaf19547..ad3dd53f08 100644
33
--- a/libavcodec/libx264.c
44
+++ b/libavcodec/libx264.c
55
@@ -33,10 +33,6 @@

SMP/config.asm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@
407407
%define HAVE_PERL 0
408408
%define HAVE_POD2MAN 0
409409
%define HAVE_TEXI2HTML 0
410+
%define HAVE_XMLLINT 0
410411
%define HAVE_ZLIB_GZIP 0
411412
%define CONFIG_DOC 0
412413
%define CONFIG_HTMLPAGES 0
@@ -2681,6 +2682,7 @@
26812682
%define CONFIG_BLURAY_PROTOCOL 1
26822683
%define CONFIG_CACHE_PROTOCOL 1
26832684
%define CONFIG_CONCAT_PROTOCOL 1
2685+
%define CONFIG_CONCATF_PROTOCOL 1
26842686
%define CONFIG_CRYPTO_PROTOCOL 1
26852687
%define CONFIG_DATA_PROTOCOL 1
26862688
%define CONFIG_FFRTMPCRYPT_PROTOCOL 1

SMP/config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@
466466
#define HAVE_PERL 0
467467
#define HAVE_POD2MAN 0
468468
#define HAVE_TEXI2HTML 0
469+
#define HAVE_XMLLINT 0
469470
#define HAVE_ZLIB_GZIP 0
470471
#define CONFIG_DOC 0
471472
#define CONFIG_HTMLPAGES 0
@@ -2804,6 +2805,7 @@
28042805
#define CONFIG_BLURAY_PROTOCOL 1
28052806
#define CONFIG_CACHE_PROTOCOL 1
28062807
#define CONFIG_CONCAT_PROTOCOL 1
2808+
#define CONFIG_CONCATF_PROTOCOL 1
28072809
#define CONFIG_CRYPTO_PROTOCOL 1
28082810
#define CONFIG_DATA_PROTOCOL 1
28092811
#define CONFIG_FFRTMPCRYPT_PROTOCOL 1

SMP/libavformat/protocol_list.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ static const URLProtocol *url_protocols[] = {
2323
&ff_bluray_protocol,
2424
&ff_cache_protocol,
2525
&ff_concat_protocol,
26+
&ff_concatf_protocol,
2627
&ff_crypto_protocol,
2728
&ff_data_protocol,
2829
&ff_ffrtmpcrypt_protocol,

0 commit comments

Comments
 (0)