projects: Update for recent upstream merge.

ShiftMediaProject · Feb 12, 2017 · c6caddb · c6caddb
1 parent 627f58d
commit c6caddb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -950,7 +950,9 @@
 %define CONFIG_APE_DECODER 1
 %define CONFIG_ATRAC1_DECODER 1
 %define CONFIG_ATRAC3_DECODER 1
+%define CONFIG_ATRAC3AL_DECODER 1
 %define CONFIG_ATRAC3P_DECODER 1
+%define CONFIG_ATRAC3PAL_DECODER 1
 %define CONFIG_BINKAUDIO_DCT_DECODER 1
 %define CONFIG_BINKAUDIO_RDFT_DECODER 1
 %define CONFIG_BMV_AUDIO_DECODER 1
@@ -1635,6 +1637,8 @@
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
+%define CONFIG_MPEG2_VAAPI_ENCODER 0
+%define CONFIG_VP8_VAAPI_ENCODER 0
 %define CONFIG_ABENCH_FILTER 1
 %define CONFIG_ACOMPRESSOR_FILTER 1
 %define CONFIG_ACROSSFADE_FILTER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -1005,7 +1005,9 @@
 #define CONFIG_APE_DECODER 1
 #define CONFIG_ATRAC1_DECODER 1
 #define CONFIG_ATRAC3_DECODER 1
+#define CONFIG_ATRAC3AL_DECODER 1
 #define CONFIG_ATRAC3P_DECODER 1
+#define CONFIG_ATRAC3PAL_DECODER 1
 #define CONFIG_BINKAUDIO_DCT_DECODER 1
 #define CONFIG_BINKAUDIO_RDFT_DECODER 1
 #define CONFIG_BMV_AUDIO_DECODER 1
@@ -1690,6 +1692,8 @@
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
+#define CONFIG_MPEG2_VAAPI_ENCODER 0
+#define CONFIG_VP8_VAAPI_ENCODER 0
 #define CONFIG_ABENCH_FILTER 1
 #define CONFIG_ACOMPRESSOR_FILTER 1
 #define CONFIG_ACROSSFADE_FILTER 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\libavcodec\mediacodec.c" />
     <ClCompile Include="..\libavcodec\mpeg12framerate.c" />
     <ClCompile Include="..\libavcodec\options.c" />
+    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
     <ClCompile Include="..\libavcodec\parser.c" />
     <ClCompile Include="..\libavcodec\profiles.c" />
     <ClCompile Include="..\libavcodec\qsv_api.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -342,6 +342,9 @@
     <ClCompile Include="..\libavcodec\options.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
@@ -3636,6 +3636,7 @@ AVCodec ff_mp3_at_decoder = {0};
 AVCodec ff_mpeg1_vdpau_decoder = {0};
 AVCodec ff_mpeg2_crystalhd_decoder = {0};
 AVCodec ff_mpeg2_mmal_decoder = {0};
+AVCodec ff_mpeg2_vaapi_encoder = {0};
 AVCodec ff_mpeg4_crystalhd_decoder = {0};
 AVCodec ff_mpeg4_mediacodec_decoder = {0};
 AVCodec ff_mpeg4_mmal_decoder = {0};
@@ -3653,6 +3654,7 @@ AVCodec ff_vc1_crystalhd_decoder = {0};
 AVCodec ff_vc1_mmal_decoder = {0};
 AVCodec ff_vc1_vdpau_decoder = {0};
 AVCodec ff_vp8_mediacodec_decoder = {0};
+AVCodec ff_vp8_vaapi_encoder = {0};
 AVCodec ff_vp9_mediacodec_decoder = {0};
 AVCodec ff_wmv3_crystalhd_decoder = {0};
 AVCodec ff_wmv3_vdpau_decoder = {0};