mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with last merge.

Browse Source
This commit is contained in:
Mike McDonald 2014-07-04 03:52:05 -04:00
parent 0ddd52a7db
commit 07351ddff4
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libfreerdp/codec/h264.c
View File

@ -214,14 +214,7 @@ void h264_context_reset(H264_CONTEXT* h264)
H264_CONTEXT* h264_context_new(BOOL Compressor)
{
<<<<<<< HEAD
H264_CONTEXT* h264;
=======
long status;
H264_CONTEXT* h264;
SDecodingParam sDecParam;
static EVideoFormatType videoFormat = videoFormatI420;
>>>>>>> 5c5386fe042de2a638a03e856afa3ec89f9d1a12
h264 = (H264_CONTEXT*) calloc(1, sizeof(H264_CONTEXT));
@ -229,31 +222,7 @@ H264_CONTEXT* h264_context_new(BOOL Compressor)
{
h264->Compressor = Compressor;
<<<<<<< HEAD
#ifdef WITH_OPENH264
=======
WelsCreateDecoder(&h264->pDecoder);
if (!h264->pDecoder)
{
printf("Failed to create OpenH264 decoder\n");
goto EXCEPTION;
}
ZeroMemory(&sDecParam, sizeof(sDecParam));
sDecParam.iOutputColorFormat = videoFormatARGB;
status = (*h264->pDecoder)->Initialize(h264->pDecoder, &sDecParam);
if (status != 0)
{
printf("Failed to initialize OpenH264 decoder (status=%ld)\n", status);
goto EXCEPTION;
}
status = (*h264->pDecoder)->SetOption(h264->pDecoder, DECODER_OPTION_DATAFORMAT, &videoFormat);
if (status != 0)
>>>>>>> 5c5386fe042de2a638a03e856afa3ec89f9d1a12
{
static EVideoFormatType videoFormat = videoFormatI420;