From 86f0bba776018cd83642c0195ac3f41f3c87c1d3 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 11 Oct 2020 19:59:24 +0200 Subject: [PATCH] lavc, lavf: Remove newlines from calls to avpriv_request_sample(). --- libavcodec/adpcm.c | 2 +- libavcodec/alsdec.c | 2 +- libavcodec/g2meet.c | 2 +- libavcodec/h264_direct.c | 2 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/tiff.c | 4 ++-- libavformat/dhav.c | 4 ++-- libavformat/vividas.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 37d503ff6c..f7da3dcf89 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -129,7 +129,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) min_channels = 2; max_channels = 8; if (avctx->channels & 1) { - avpriv_request_sample(avctx, "channel count %d\n", avctx->channels); + avpriv_request_sample(avctx, "channel count %d", avctx->channels); return AVERROR_PATCHWELCOME; } break; diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 62c6036037..c2c460a29c 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -350,7 +350,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx) return AVERROR_INVALIDDATA; if (avctx->channels > FF_SANE_NB_CHANNELS) { - avpriv_request_sample(avctx, "Huge number of channels\n"); + avpriv_request_sample(avctx, "Huge number of channels"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 7ef275c9fe..6b870ae3d4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -560,7 +560,7 @@ static uint32_t epic_decode_pixel_pred(ePICContext *dc, int x, int y, } if (R<0 || G<0 || B<0 || R > 255 || G > 255 || B > 255) { - avpriv_request_sample(NULL, "RGB %d %d %d is out of range\n", R, G, B); + avpriv_request_sample(NULL, "RGB %d %d %d (out of range)", R, G, B); return 0; } diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index a01d823e7a..8f07981130 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -43,7 +43,7 @@ static int get_scale_factor(H264SliceContext *sl, int td = av_clip_int8(pocdiff); if (pocdiff != (int)pocdiff) - avpriv_request_sample(sl->h264->avctx, "pocdiff overflow\n"); + avpriv_request_sample(sl->h264->avctx, "pocdiff overflow"); if (td == 0 || sl->ref_list[0][i].parent->long_ref) { return 256; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 14fb79261d..95a0e63a29 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3347,7 +3347,7 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, int next_start_code_studio(gb); extension_and_user_data(s, gb, 0); } else if (s->studio_profile) { - avpriv_request_sample(s->avctx, "Mixes studio and non studio profile\n"); + avpriv_request_sample(s->avctx, "Mix of studio and non studio profile"); return AVERROR_PATCHWELCOME; } s->avctx->profile = profile; diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 9bf08b1900..2e45464218 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1590,7 +1590,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; case TIFF_GEO_KEY_DIRECTORY: if (s->geotag_count) { - avpriv_request_sample(s->avctx, "Multiple geo key directories\n"); + avpriv_request_sample(s->avctx, "Multiple geo key directories"); return AVERROR_INVALIDDATA; } ADD_METADATA(1, "GeoTIFF_Version", NULL); @@ -1860,7 +1860,7 @@ again: return AVERROR_INVALIDDATA; } if (off <= last_off) { - avpriv_request_sample(s->avctx, "non increasing IFD offset\n"); + avpriv_request_sample(s->avctx, "non increasing IFD offset"); return AVERROR_INVALIDDATA; } if (off >= UINT_MAX - 14 || avpkt->size < off + 14) { diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 5e9abdb611..79afe9be03 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -359,7 +359,7 @@ retry: case 0x4: case 0x8: st->codecpar->codec_id = AV_CODEC_ID_H264; break; case 0xc: st->codecpar->codec_id = AV_CODEC_ID_HEVC; break; - default: avpriv_request_sample(s, "Unknown video codec %X\n", dhav->video_codec); + default: avpriv_request_sample(s, "Unknown video codec %X", dhav->video_codec); } st->duration = dhav->duration; st->codecpar->width = dhav->width; @@ -392,7 +392,7 @@ retry: case 0x1f: st->codecpar->codec_id = AV_CODEC_ID_MP2; break; case 0x21: st->codecpar->codec_id = AV_CODEC_ID_MP3; break; case 0x0d: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_MS; break; - default: avpriv_request_sample(s, "Unknown audio codec %X\n", dhav->audio_codec); + default: avpriv_request_sample(s, "Unknown audio codec %X", dhav->audio_codec); } st->duration = dhav->duration; st->codecpar->channels = dhav->audio_channels; diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 7917df5d64..4b2801ef34 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -156,7 +156,7 @@ static void decode_block(uint8_t *src, uint8_t *dest, unsigned size, uint32_t tmpkey = *key_ptr - key; if (a2 > s) { a2 = s; - avpriv_request_sample(NULL, "tiny aligned block\n"); + avpriv_request_sample(NULL, "tiny aligned block"); } memcpy(tmp + align, src, a2); xor_block(tmp, tmp, 4, key, &tmpkey);