From 07351ddff4225f2a5461a3f8521ace4344ba4a9e Mon Sep 17 00:00:00 2001 From: Mike McDonald Date: Fri, 4 Jul 2014 03:52:05 -0400 Subject: [PATCH] Fixed issue with last merge. --- libfreerdp/codec/h264.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/libfreerdp/codec/h264.c b/libfreerdp/codec/h264.c index 0ddccb951..2f1b22c4f 100644 --- a/libfreerdp/codec/h264.c +++ b/libfreerdp/codec/h264.c @@ -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;