From bb47046e609c78a86a21954799383703f982d197 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 20 Nov 2016 18:18:47 +1100
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm                  |  2 ++
 SMP/config.h                    |  2 ++
 SMP/libavcodec.vcxproj          |  7 ++++---
 SMP/libavcodec.vcxproj.filters  | 21 ++++++++++++---------
 SMP/libavformat.def             |  1 +
 SMP/libavformat.vcxproj         |  3 ++-
 SMP/libavformat.vcxproj.filters |  7 +++++--
 SMP/libavformat/protocol_list.c |  1 +
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index d1fe111960..2e4efd93d5 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -621,6 +621,7 @@
 %define CONFIG_H263DSP 1
 %define CONFIG_H264CHROMA 1
 %define CONFIG_H264DSP 1
+%define CONFIG_H264PARSE 1
 %define CONFIG_H264PRED 1
 %define CONFIG_H264QPEL 1
 %define CONFIG_HPELDSP 1
@@ -2226,6 +2227,7 @@
 %define CONFIG_MMST_PROTOCOL 1
 %define CONFIG_MD5_PROTOCOL 1
 %define CONFIG_PIPE_PROTOCOL 1
+%define CONFIG_PROMPEG_PROTOCOL 1
 %define CONFIG_RTMP_PROTOCOL 1
 %define CONFIG_RTMPE_PROTOCOL 1
 %define CONFIG_RTMPS_PROTOCOL 1
diff --git a/SMP/config.h b/SMP/config.h
index f69819f86a..e12393fa9d 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -671,6 +671,7 @@
 #define CONFIG_H263DSP 1
 #define CONFIG_H264CHROMA 1
 #define CONFIG_H264DSP 1
+#define CONFIG_H264PARSE 1
 #define CONFIG_H264PRED 1
 #define CONFIG_H264QPEL 1
 #define CONFIG_HPELDSP 1
@@ -2286,6 +2287,7 @@
 #define CONFIG_MMST_PROTOCOL 1
 #define CONFIG_MD5_PROTOCOL 1
 #define CONFIG_PIPE_PROTOCOL 1
+#define CONFIG_PROMPEG_PROTOCOL 1
 #define CONFIG_RTMP_PROTOCOL 1
 #define CONFIG_RTMPE_PROTOCOL 1
 #define CONFIG_RTMPS_PROTOCOL 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index a67ebd0545..3553da99aa 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -169,6 +169,7 @@
     <ClCompile Include="..\libavcodec\jni.c" />
     <ClCompile Include="..\libavcodec\mathtables.c" />
     <ClCompile Include="..\libavcodec\mediacodec.c" />
+    <ClCompile Include="..\libavcodec\mpeg12framerate.c" />
     <ClCompile Include="..\libavcodec\options.c" />
     <ClCompile Include="..\libavcodec\parser.c" />
     <ClCompile Include="..\libavcodec\profiles.c" />
@@ -203,6 +204,9 @@
     <ClCompile Include="..\libavcodec\h264chroma.c" />
     <ClCompile Include="..\libavcodec\h264dsp.c" />
     <ClCompile Include="..\libavcodec\h264idct.c" />
+    <ClCompile Include="..\libavcodec\h264_parse.c" />
+    <ClCompile Include="..\libavcodec\h2645_parse.c" />
+    <ClCompile Include="..\libavcodec\h264_ps.c" />
     <ClCompile Include="..\libavcodec\h264pred.c" />
     <ClCompile Include="..\libavcodec\h264qpel.c" />
     <ClCompile Include="..\libavcodec\huffman.c" />
@@ -481,13 +485,10 @@
     <ClCompile Include="..\libavcodec\h264_loopfilter.c" />
     <ClCompile Include="..\libavcodec\h264_mb.c" />
     <ClCompile Include="..\libavcodec\h264_picture.c" />
-    <ClCompile Include="..\libavcodec\h264_ps.c" />
     <ClCompile Include="..\libavcodec\h264_refs.c" />
     <ClCompile Include="..\libavcodec\h264_sei.c" />
     <ClCompile Include="..\libavcodec\h264_slice.c" />
     <ClCompile Include="..\libavcodec\h264data.c" />
-    <ClCompile Include="..\libavcodec\h264_parse.c" />
-    <ClCompile Include="..\libavcodec\h2645_parse.c" />
     <ClCompile Include="..\libavcodec\nvenc_h264.c" />
     <ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
     <ClCompile Include="..\libavcodec\qsvenc_h264.c" />
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index b7368cfdfc..b09f12c58f 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -330,6 +330,9 @@
     <ClCompile Include="..\libavcodec\mediacodec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mpeg12framerate.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\options.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -432,6 +435,15 @@
     <ClCompile Include="..\libavcodec\h264idct.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\h264_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\h2645_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\h264_ps.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\h264pred.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1266,9 +1278,6 @@
     <ClCompile Include="..\libavcodec\h264_picture.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\h264_ps.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\h264_refs.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1281,12 +1290,6 @@
     <ClCompile Include="..\libavcodec\h264data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\h264_parse.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\h2645_parse.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\nvenc_h264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
diff --git a/SMP/libavformat.def b/SMP/libavformat.def
index d355499c28..aad1b48283 100644
--- a/SMP/libavformat.def
+++ b/SMP/libavformat.def
@@ -66,6 +66,7 @@ EXPORTS
     av_register_output_format
     av_sdp_create
     av_seek_frame
+    av_stream_add_side_data
     av_stream_get_codec_timebase
     av_stream_get_end_pts
     av_stream_get_parser
diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
index 970dd04845..b1cff5275b 100644
--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -309,8 +309,8 @@
     <ClCompile Include="..\libavformat\vpcc.c" />
     <ClCompile Include="..\libavformat\movenchint.c" />
     <ClCompile Include="..\libavformat\movenccenc.c" />
-    <ClCompile Include="..\libavformat\mp3enc.c" />
     <ClCompile Include="..\libavformat\mp3dec.c" />
+    <ClCompile Include="..\libavformat\mp3enc.c" />
     <ClCompile Include="..\libavformat\mpc.c" />
     <ClCompile Include="..\libavformat\mpc8.c" />
     <ClCompile Include="..\libavformat\mpegenc.c" />
@@ -496,6 +496,7 @@
     <ClCompile Include="..\libavformat\mmsh.c" />
     <ClCompile Include="..\libavformat\mms.c" />
     <ClCompile Include="..\libavformat\mmst.c" />
+    <ClCompile Include="..\libavformat\prompeg.c" />
     <ClCompile Include="..\libavformat\rtmpproto.c" />
     <ClCompile Include="..\libavformat\rtmppkt.c" />
     <ClCompile Include="..\libavformat\rtpproto.c" />
diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
index ef321fe14e..b3aa5357e7 100644
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -751,10 +751,10 @@
     <ClCompile Include="..\libavformat\movenccenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\mp3enc.c">
+    <ClCompile Include="..\libavformat\mp3dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\mp3dec.c">
+    <ClCompile Include="..\libavformat\mp3enc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
     <ClCompile Include="..\libavformat\mpc.c">
@@ -1312,6 +1312,9 @@
     <ClCompile Include="..\libavformat\mmst.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\prompeg.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\rtmpproto.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
diff --git a/SMP/libavformat/protocol_list.c b/SMP/libavformat/protocol_list.c
index b592e74393..33e717cff0 100644
--- a/SMP/libavformat/protocol_list.c
+++ b/SMP/libavformat/protocol_list.c
@@ -39,6 +39,7 @@ static const URLProtocol *url_protocols[] = {
     &ff_mmst_protocol,
     &ff_md5_protocol,
     &ff_pipe_protocol,
+    &ff_prompeg_protocol,
     &ff_rtmp_protocol,
     &ff_rtmpe_protocol,
     &ff_rtmps_protocol,
-- 
GitLab