From aff9a22367ce4a317ff256350b6d0200247bfc81 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Fri, 19 Jan 2018 14:26:04 +0100 Subject: [PATCH] Fixed obsolete TAG definitions and use. --- libfreerdp/codec/h264_ffmpeg.c | 14 ++++++-------- libfreerdp/codec/h264_openh264.c | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c index 7b6dabdc2..78a38b7b6 100644 --- a/libfreerdp/codec/h264_ffmpeg.c +++ b/libfreerdp/codec/h264_ffmpeg.c @@ -37,8 +37,6 @@ #endif #endif -#define TAG FREERDP_TAG("codec") - /* Fallback support for older libavcodec versions */ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) #define AV_CODEC_ID_H264 CODEC_ID_H264 @@ -265,12 +263,12 @@ static int libavcodec_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, #endif #if 0 - WLog_Print(h264->log, WLOG_INFO, (TAG, - "libavcodec_decompress: frame decoded (status=%d, gotFrame=%d, width=%d, height=%d, Y=[%p,%d], U=[%p,%d], V=[%p,%d])", - status, gotFrame, sys->videoFrame->width, sys->videoFrame->height, - (void*) sys->videoFrame->data[0], sys->videoFrame->linesize[0], - (void*) sys->videoFrame->data[1], sys->videoFrame->linesize[1], - (void*) sys->videoFrame->data[2], sys->videoFrame->linesize[2]); + WLog_Print(h264->log, WLOG_INFO, + "libavcodec_decompress: frame decoded (status=%d, gotFrame=%d, width=%d, height=%d, Y=[%p,%d], U=[%p,%d], V=[%p,%d])", + status, gotFrame, sys->videoFrame->width, sys->videoFrame->height, + (void*) sys->videoFrame->data[0], sys->videoFrame->linesize[0], + (void*) sys->videoFrame->data[1], sys->videoFrame->linesize[1], + (void*) sys->videoFrame->data[2], sys->videoFrame->linesize[2]); #endif if (gotFrame) diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c index ae54bc747..b836fda4b 100644 --- a/libfreerdp/codec/h264_openh264.c +++ b/libfreerdp/codec/h264_openh264.c @@ -25,8 +25,6 @@ #include "wels/codec_api.h" #include "wels/codec_ver.h" -#define TAG FREERDP_TAG("codec") - #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR < 3) || (OPENH264_MAJOR < 1) #error "Unsupported OpenH264 version "OPENH264_MAJOR"."OPENH264_MINOR"."OPENH264_REVISION" detected!" #elif (OPENH264_MAJOR > 1) || (OPENH264_MINOR > 7)