From patchwork Mon Mar 27 07:52:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 3120 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp52018vss; Mon, 27 Mar 2017 00:53:37 -0700 (PDT) X-Received: by 10.28.165.147 with SMTP id o141mr8254135wme.67.1490601217563; Mon, 27 Mar 2017 00:53:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q30si5611970wrc.151.2017.03.27.00.53.37; Mon, 27 Mar 2017 00:53:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8B7E6883E6; Mon, 27 Mar 2017 10:52:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 725FD688389 for ; Mon, 27 Mar 2017 10:51:58 +0300 (EEST) Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 6bda9c30; Mon, 27 Mar 2017 07:52:08 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2017 09:52:03 +0200 Message-Id: <20170327075203.7499-10-u@pkh.me> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170327075203.7499-1-u@pkh.me> References: <20170327075203.7499-1-u@pkh.me> Subject: [FFmpeg-devel] [PATCH 10/10] lavc: use av_4cc2str() where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/pngdec.c | 7 ++----- libavcodec/vqavideo.c | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index a4eb6cce1b..52f5cc06f8 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1143,11 +1143,8 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, } tag = bytestream2_get_le32(&s->gb); if (avctx->debug & FF_DEBUG_STARTCODE) - av_log(avctx, AV_LOG_DEBUG, "png: tag=%c%c%c%c length=%u\n", - (tag & 0xff), - ((tag >> 8) & 0xff), - ((tag >> 16) & 0xff), - ((tag >> 24) & 0xff), length); + av_log(avctx, AV_LOG_DEBUG, "png: tag=%s length=%u\n", + av_4cc2str(tag), length); if (avctx->codec_id == AV_CODEC_ID_PNG && avctx->skip_frame == AVDISCARD_ALL) { diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 81d50bb5a4..ede163d0ea 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -384,12 +384,8 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) break; default: - av_log(s->avctx, AV_LOG_ERROR, "Found unknown chunk type: %c%c%c%c (%08X)\n", - (chunk_type >> 24) & 0xFF, - (chunk_type >> 16) & 0xFF, - (chunk_type >> 8) & 0xFF, - (chunk_type >> 0) & 0xFF, - chunk_type); + av_log(s->avctx, AV_LOG_ERROR, "Found unknown chunk type: %s (%08X)\n", + av_4cc2str(av_bswap32(chunk_type)), chunk_type); break; }