diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-03 18:32:03 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-03 18:32:03 +0400 |
commit | 6aee43157c3465acd2390ac58c2d68ea266a0a42 (patch) | |
tree | fc7b402425a45e42df74c5ee8052a05ef8b1cc7c | |
parent | 4f11573c2b07632d078e98dc50620a1935ad5d17 (diff) |
-fixed standalone MPCVideoDec and MpaDecFilter compilation
-added some project dependencies in filters solution file
-fixed some warnings
This commit fixes ticket #453
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1835 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | src/filters/filters.sln | 51 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h | 12 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h | 8 |
3 files changed, 39 insertions, 32 deletions
diff --git a/src/filters/filters.sln b/src/filters/filters.sln index 0865abdc8..4b78ffd5d 100644 --- a/src/filters/filters.sln +++ b/src/filters/filters.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asyncreader", "reader\async {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cddareader", "reader\cddareader\cddareader.vcproj", "{543D40E9-8CA6-4E4B-9936-90CBA562B268}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDDAReader", "reader\cddareader\cddareader.vcproj", "{543D40E9-8CA6-4E4B-9936-90CBA562B268}"
ProjectSection(ProjectDependencies) = postProject
{9F31D122-E84D-485A-A58D-09DAD01A56CE} = {9F31D122-E84D-485A-A58D-09DAD01A56CE}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
@@ -15,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cddareader", "reader\cddare {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdxareader", "reader\cdxareader\cdxareader.vcproj", "{4D3B4FF4-535A-4201-AB7D-9AEC1E737A95}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDXAReader", "reader\cdxareader\cdxareader.vcproj", "{4D3B4FF4-535A-4201-AB7D-9AEC1E737A95}"
ProjectSection(ProjectDependencies) = postProject
{9F31D122-E84D-485A-A58D-09DAD01A56CE} = {9F31D122-E84D-485A-A58D-09DAD01A56CE}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
@@ -23,56 +23,56 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdxareader", "reader\cdxare {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d2vsource", "source\d2vsource\d2vsource.vcproj", "{83CC6B88-A112-4192-BD5A-F2A249AF2277}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D2VSource", "source\d2vsource\d2vsource.vcproj", "{83CC6B88-A112-4192-BD5A-F2A249AF2277}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flicsource", "source\flicsource\flicsource.vcproj", "{431DD5B6-3F2F-47EE-A23F-514BC044B704}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FLICSource", "source\flicsource\flicsource.vcproj", "{431DD5B6-3F2F-47EE-A23F-514BC044B704}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audioswitcher", "switcher\audioswitcher\audioswitcher.vcproj", "{D8DB3E7E-D50E-4EC3-A9B9-DAD18F5FE466}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioSwitcher", "switcher\audioswitcher\audioswitcher.vcproj", "{D8DB3E7E-D50E-4EC3-A9B9-DAD18F5FE466}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avi2ac3filter", "transform\avi2ac3filter\avi2ac3filter.vcproj", "{339A4575-E25B-45D6-94A1-D835891740B8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVI2AC3Filter", "transform\avi2ac3filter\avi2ac3filter.vcproj", "{339A4575-E25B-45D6-94A1-D835891740B8}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bufferfilter", "transform\bufferfilter\bufferfilter.vcproj", "{9DCFD02A-16A0-4766-BC18-66163E21929D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BufferFilter", "transform\bufferfilter\bufferfilter.vcproj", "{9DCFD02A-16A0-4766-BC18-66163E21929D}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decssfilter", "transform\decssfilter\decssfilter.vcproj", "{F6B06383-3FFD-403B-9867-4AA82A20AA83}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeCSSFilter", "transform\decssfilter\decssfilter.vcproj", "{F6B06383-3FFD-403B-9867-4AA82A20AA83}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basesource", "source\basesource\basesource.vcproj", "{F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseSource", "source\basesource\basesource.vcproj", "{F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}"
ProjectSection(ProjectDependencies) = postProject
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavdest", "muxer\WavDest\wavdest.vcproj", "{EB202B68-8029-4985-B914-E94B44D2E230}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WavDest", "muxer\WavDest\wavdest.vcproj", "{EB202B68-8029-4985-B914-E94B44D2E230}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtsreader", "reader\vtsreader\vtsreader.vcproj", "{664E726B-EEEE-403A-AC15-345D9C9E1375}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTSReader", "reader\vtsreader\vtsreader.vcproj", "{664E726B-EEEE-403A-AC15-345D9C9E1375}"
ProjectSection(ProjectDependencies) = postProject
{9F31D122-E84D-485A-A58D-09DAD01A56CE} = {9F31D122-E84D-485A-A58D-09DAD01A56CE}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
@@ -80,19 +80,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtsreader", "reader\vtsread {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "streamdrivethru", "parser\streamdrivethru\streamdrivethru.vcproj", "{AE399B7E-2B2C-4A96-9016-C5C74B0A2FA0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StreamDriveThru", "parser\streamdrivethru\streamdrivethru.vcproj", "{AE399B7E-2B2C-4A96-9016-C5C74B0A2FA0}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtsac3source", "source\dtsac3source\dtsac3source.vcproj", "{30D48874-899F-41C6-9B26-A40C96C91102}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DTSAC3Source", "source\dtsac3source\dtsac3source.vcproj", "{30D48874-899F-41C6-9B26-A40C96C91102}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shoutcastsource", "source\shoutcastsource\shoutcastsource.vcproj", "{42B599D7-BB84-481F-A42A-2DBE0E2E2D7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShoutcastSource", "source\shoutcastsource\shoutcastsource.vcproj", "{42B599D7-BB84-481F-A42A-2DBE0E2E2D7E}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
@@ -120,7 +120,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RealMediaSplitter", "parser {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basesplitter", "parser\basesplitter\basesplitter.vcproj", "{37768B3F-89BC-4C16-B2A8-767C5DA84C3F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseSplitter", "parser\basesplitter\basesplitter.vcproj", "{37768B3F-89BC-4C16-B2A8-767C5DA84C3F}"
ProjectSection(ProjectDependencies) = postProject
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
@@ -143,10 +143,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpaDecFilter", "transform\mpadecfilter\MpaDecFilter.vcproj", "{4421516D-10A6-41C1-ADF3-099573BBB0C6}"
ProjectSection(ProjectDependencies) = postProject
{D8365C15-2166-4DB6-8A2D-1C8F0239EB18} = {D8365C15-2166-4DB6-8A2D-1C8F0239EB18}
+ {5CAF881C-9349-4EE2-9697-982C10795033} = {5CAF881C-9349-4EE2-9697-982C10795033}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{A7134255-DFF3-42F7-9BC2-FAC6E71CFFAE} = {A7134255-DFF3-42F7-9BC2-FAC6E71CFFAE}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{62FE6D94-E17C-4A8E-8D3C-7A589A70D865} = {62FE6D94-E17C-4A8E-8D3C-7A589A70D865}
+ {438286B7-A9F4-411D-BCC5-948C40E37D8F} = {438286B7-A9F4-411D-BCC5-948C40E37D8F}
{FAE14DBE-B508-4AB3-929D-75C68E4EBBC1} = {FAE14DBE-B508-4AB3-929D-75C68E4EBBC1}
{5EFCFACB-1835-422C-ACDA-E3B3A2F51387} = {5EFCFACB-1835-422C-ACDA-E3B3A2F51387}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
@@ -207,7 +209,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpaSplitter", "parser\mpasp {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basevideofilter", "transform\basevideofilter\basevideofilter.vcproj", "{54DDA60F-E528-4D07-A152-960A1E818680}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseVideoFilter", "transform\basevideofilter\basevideofilter.vcproj", "{54DDA60F-E528-4D07-A152-960A1E818680}"
ProjectSection(ProjectDependencies) = postProject
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
@@ -230,7 +232,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMMuxer", "muxer\DSMMuxer\ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitlesource", "source\subtitlesource\subtitlesource.vcproj", "{8F998497-9C51-4FAA-83E4-1D85B22CBA13}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubtitleSource", "source\subtitlesource\subtitlesource.vcproj", "{8F998497-9C51-4FAA-83E4-1D85B22CBA13}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
@@ -245,7 +247,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MP4Splitter", "parser\mp4sp {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udpreader", "reader\udpreader\UDPReader.vcproj", "{3020FF9B-8202-488D-B137-11DECC510E6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UDPReader", "reader\udpreader\UDPReader.vcproj", "{3020FF9B-8202-488D-B137-11DECC510E6E}"
ProjectSection(ProjectDependencies) = postProject
{9F31D122-E84D-485A-A58D-09DAD01A56CE} = {9F31D122-E84D-485A-A58D-09DAD01A56CE}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
@@ -280,17 +282,20 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPCVideoDec", "transform\mpcvideodec\MPCVideoDec.vcproj", "{58E36BF5-4A06-47E4-BD40-4CCEF8C634DF}"
ProjectSection(ProjectDependencies) = postProject
{54DDA60F-E528-4D07-A152-960A1E818680} = {54DDA60F-E528-4D07-A152-960A1E818680}
+ {5CAF881C-9349-4EE2-9697-982C10795033} = {5CAF881C-9349-4EE2-9697-982C10795033}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49} = {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}
+ {438286B7-A9F4-411D-BCC5-948C40E37D8F} = {438286B7-A9F4-411D-BCC5-948C40E37D8F}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libavcodec", "transform\mpcvideodec\ffmpeg\libavcodec.vcproj", "{5CAF881C-9349-4EE2-9697-982C10795033}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flacsource", "source\flacsource\Flacsource.vcproj", "{916D0FC1-1D86-487A-82DE-37FBEE43FB34}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlacSource", "source\flacsource\Flacsource.vcproj", "{916D0FC1-1D86-487A-82DE-37FBEE43FB34}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
+ {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E} = {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -311,13 +316,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSFilter", "transform\vsfil {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsutil", "..\DSUtil\dsutil.vcproj", "{FC70988B-1AE5-4381-866D-4F405E28AC42}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSUtil", "..\DSUtil\dsutil.vcproj", "{FC70988B-1AE5-4381-866D-4F405E28AC42}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitles", "..\subtitles\subtitles.vcproj", "{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssf", "..\subtitles\libssf\libssf.vcproj", "{DD9D2D92-2241-408A-859E-B85D444B7E3C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subpic", "..\SubPic\subpic.vcproj", "{D514EA4D-EAFB-47A9-A437-A582CA571251}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubPic", "..\SubPic\subpic.vcproj", "{D514EA4D-EAFB-47A9-A437-A582CA571251}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpcAudioRendererFilter", "renderer\MpcAudioRenderer\MpcAudioRendererFilter.vcproj", "{D0620EF4-1313-40D5-9069-A82F6FE26994}"
ProjectSection(ProjectDependencies) = postProject
@@ -1129,7 +1134,6 @@ Global {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release Unicode|x64.Build.0 = Release|x64
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Debug Unicode lib|Win32.ActiveCfg = Debug|Win32
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Debug Unicode lib|x64.ActiveCfg = Debug|x64
- {438286B7-A9F4-411D-BCC5-948C40E37D8F}.Debug Unicode lib|x64.Build.0 = Debug|x64
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Debug Unicode|x64.ActiveCfg = Debug|x64
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Release Unicode lib|Win32.ActiveCfg = Release|Win32
@@ -1139,6 +1143,7 @@ Global {438286B7-A9F4-411D-BCC5-948C40E37D8F}.Release Unicode|Win32.ActiveCfg = Release|Win32
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Release Unicode|Win32.Build.0 = Release|Win32
{438286B7-A9F4-411D-BCC5-948C40E37D8F}.Release Unicode|x64.ActiveCfg = Release|x64
+ {438286B7-A9F4-411D-BCC5-948C40E37D8F}.Release Unicode|x64.Build.0 = Release|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug Unicode lib|Win32.ActiveCfg = Debug Unicode lib|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug Unicode lib|Win32.Build.0 = Debug Unicode lib|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug Unicode lib|x64.ActiveCfg = Debug Unicode lib|x64
@@ -1160,11 +1165,13 @@ Global {F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+ {F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode lib|Win32.ActiveCfg = Release Unicode|Win32
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode lib|x64.ActiveCfg = Release Unicode|x64
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+ {F671100C-469F-4723-AAC4-B7FE4F5B8DC4}.Release Unicode|x64.Build.0 = Release Unicode|x64
{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode lib|Win32.ActiveCfg = Debug Unicode|Win32
{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode lib|Win32.Build.0 = Debug Unicode|Win32
{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode lib|x64.ActiveCfg = Debug Unicode|x64
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h index 947459d15..5d9b0269c 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h @@ -19,7 +19,7 @@ */
/**
- * @file libavcodec/get_bits.h
+ * @file
* bitstream reader API header.
*/
@@ -40,9 +40,13 @@ #endif
#if !defined(LIBMPEG2_BITSTREAM_READER) && !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER)
+# if ARCH_ARM && !HAVE_FAST_UNALIGNED
+# define A32_BITSTREAM_READER
+# else
# define ALT_BITSTREAM_READER
//#define LIBMPEG2_BITSTREAM_READER
//#define A32_BITSTREAM_READER
+# endif
#endif
/* bit input */
@@ -660,11 +664,7 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha #define tprintf(p, ...) av_log(p, AV_LOG_DEBUG, __VA_ARGS__)
#else //TRACE
- #ifdef __GNUC__
- #define tprintf(p, ...) {}
- #else
- #define tprintf(p) {}
- #endif
+#define tprintf(p, ...) {}
#endif
static inline int decode012(GetBitContext *gb){
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h index aafd653e0..d1724a2e9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavutil/internal.h @@ -106,11 +106,11 @@ # define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F))
#endif
-#define snprintf _snprintf
-
-#if !defined(_MSC_VER)
-#define vsnprintf _vsnprintf
+/* MPC custom code start */
+#if defined(_DEBUG)
+# define snprintf _snprintf
#endif
+/* MPC custom code end */
/* Use to export labels from asm. */
#define LABEL_MANGLE(a) EXTERN_PREFIX #a
|