projects: Update for recent upstream merge.

SMP/libavcodec.def

@@ -159,10 +159,9 @@ EXPORTS
     avpicture_get_size
     avpicture_layout
     avpriv_aac_parse_header
-    avpriv_ac3_parse_header2
+    avpriv_ac3_parse_header
     avpriv_align_put_bits
     avpriv_bprint_to_extradata
-    avpriv_color_frame
     avpriv_copy_bits
     avpriv_copy_pce_data
     avpriv_dca_convert_bitstream

SMP/libavcodec.vcxproj

@@ -64,12 +64,7 @@
     <YASM Include="..\libavcodec\x86\blockdsp.asm" />
     <YASM Include="..\libavcodec\x86\bswapdsp.asm" />
     <YASM Include="..\libavcodec\x86\dct32.asm" />
-    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm" />
-    <YASM Include="..\libavcodec\x86\dwt_yasm.asm" />
-    <YASM Include="..\libavcodec\x86\dnxhdenc.asm" />
     <YASM Include="..\libavcodec\x86\fft.asm" />
-    <YASM Include="..\libavcodec\x86\flacdsp.asm" />
-    <YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm" />
     <YASM Include="..\libavcodec\x86\fmtconvert.asm" />
     <YASM Include="..\libavcodec\x86\h263_loopfilter.asm" />
     <YASM Include="..\libavcodec\x86\h264_chromamc.asm" />
@@ -109,6 +104,11 @@
     <YASM Include="..\libavcodec\x86\alacdsp.asm" />
     <YASM Include="..\libavcodec\x86\pngdsp.asm" />
     <YASM Include="..\libavcodec\x86\dcadsp.asm" />
+    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm" />
+    <YASM Include="..\libavcodec\x86\dwt_yasm.asm" />
+    <YASM Include="..\libavcodec\x86\dnxhdenc.asm" />
+    <YASM Include="..\libavcodec\x86\flacdsp.asm" />
+    <YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm" />
     <YASM Include="..\libavcodec\x86\hevc_mc.asm" />
     <YASM Include="..\libavcodec\x86\hevc_deblock.asm" />
     <YASM Include="..\libavcodec\x86\hevc_idct.asm" />

SMP/libavcodec.vcxproj.filters

@@ -36,24 +36,9 @@
     <YASM Include="..\libavcodec\x86\dct32.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
-    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dwt_yasm.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\dnxhdenc.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
     <YASM Include="..\libavcodec\x86\fft.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
-    <YASM Include="..\libavcodec\x86\flacdsp.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
-    <YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
     <YASM Include="..\libavcodec\x86\fmtconvert.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -171,6 +156,21 @@
     <YASM Include="..\libavcodec\x86\dcadsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
+    <YASM Include="..\libavcodec\x86\dwt_yasm.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
+    <YASM Include="..\libavcodec\x86\dnxhdenc.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
+    <YASM Include="..\libavcodec\x86\flacdsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
+    <YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\hevc_mc.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>

SMP/libavformat.vcxproj

@@ -573,6 +573,8 @@
     </ClCompile>
     <ClCompile Include="..\libavformat\oggparsecelt.c">
     </ClCompile>
+    <ClCompile Include="..\libavformat\oggparsedaala.c">
+    </ClCompile>
     <ClCompile Include="..\libavformat\oggparsedirac.c">
     </ClCompile>
     <ClCompile Include="..\libavformat\oggparseflac.c">

SMP/libavformat.vcxproj.filters

@@ -789,6 +789,9 @@
     <ClCompile Include="..\libavformat\oggparsecelt.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\oggparsedaala.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\oggparsedirac.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>