From 34b1fccb288cfa0756f14f7bc1b50eb29aa2b2e6 Mon Sep 17 00:00:00 2001 From: jojo61 Date: Thu, 12 Mar 2020 08:05:39 +0100 Subject: [PATCH] Fis issues #36 #37 #38 --- hdr.c | 1 + softhdcuvid.cpp | 2 +- softhddev.c | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hdr.c b/hdr.c index b4b9238..5ec1cca 100644 --- a/hdr.c +++ b/hdr.c @@ -392,6 +392,7 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid break; case AVCOL_TRC_SMPTE2084: // 16 eotf = EOTF_ST2084; + break; default: eotf = EOTF_TRADITIONAL_GAMMA_SDR; break; diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp index ae31d1b..540c899 100644 --- a/softhdcuvid.cpp +++ b/softhdcuvid.cpp @@ -1133,7 +1133,7 @@ void cMenuSetupSoft::Create(void) static char *scalingtest[100]; if (scalers == 0) { - scalingtest[0] = "Off"; + scalingtest[0] = (char *) "Off"; for (scalers = 0; pl_named_filters[scalers].filter != NULL; scalers++) { scaling[scalers] = (char *)pl_named_filters[scalers].name; scalingtest[scalers + 1] = (char *)pl_named_filters[scalers].name; diff --git a/softhddev.c b/softhddev.c index 7f61a51..7b95ea9 100644 --- a/softhddev.c +++ b/softhddev.c @@ -645,7 +645,7 @@ static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_st q = pesdx->Buffer + pesdx->Skip; n = pesdx->Index - pesdx->Skip; while (n >= 5) { - int r; + int r=0; unsigned codec_id = AV_CODEC_ID_NONE; // 4 bytes 0xFFExxxxx Mpeg audio @@ -655,8 +655,7 @@ static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_st // 7/9 bytes 0xFFFxxxxxxxxxxx ADTS audio // PCM audio can't be found // FIXME: simple+faster detection, if codec already known - r = 0; - if (!r && FastMpegCheck(q)) { + if (FastMpegCheck(q)) { r = MpegCheck(q, n); codec_id = AV_CODEC_ID_MP2; }