From 6f1753e3e5be762cd9f356d711ba15395784e447 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 20 Jun 2019 20:48:12 +0200 Subject: [PATCH] generic-pc: reduce warnings Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1d310db5e9bb47f3848513dd14e8eb5d2baced05 Author: Jacek Jendrzej Date: 2019-06-20 (Thu, 20 Jun 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libgeneric-pc/audio.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libgeneric-pc/audio.cpp b/libgeneric-pc/audio.cpp index 8b82b51..e9d3514 100644 --- a/libgeneric-pc/audio.cpp +++ b/libgeneric-pc/audio.cpp @@ -347,6 +347,7 @@ void cAudio::run() uint8_t *inbuf = (uint8_t *)av_malloc(INBUF_SIZE); AVPacket avpkt; int ret, driver; + int av_ret = 0; /* libao */ ao_info *ai; // ao_device *adevice; @@ -460,13 +461,13 @@ void cAudio::run() #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,37,100) avcodec_decode_audio4(c, frame, &gotframe, &avpkt); #else - int ret = avcodec_send_packet(c, &avpkt); - if (ret != 0 && ret != AVERROR(EAGAIN)) { - hal_info("%s: avcodec_send_packet %d\n", __func__, ret); + av_ret = avcodec_send_packet(c, &avpkt); + if (av_ret != 0 && av_ret != AVERROR(EAGAIN)) { + hal_info("%s: avcodec_send_packet %d\n", __func__, av_ret); }else { - ret = avcodec_receive_frame(c, frame); - if (ret != 0 && ret != AVERROR(EAGAIN)) { - hal_info("%s: avcodec_send_packet %d\n", __func__, ret); + av_ret = avcodec_receive_frame(c, frame); + if (av_ret != 0 && av_ret != AVERROR(EAGAIN)) { + hal_info("%s: avcodec_send_packet %d\n", __func__, av_ret); }else { gotframe = 1; }