From daf2c35f52e0193b7fc39fc954767bcbc1b52a39 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos <cehoyos@ag.or.at> Date: Tue, 11 Aug 2015 22:50:45 +0200 Subject: lavc: Remove newline from avpriv_request_sample() calls. --- libavcodec/c93.c | 2 +- libavcodec/dvbsubdec.c | 2 +- libavcodec/jpeg2000dec.c | 8 ++++---- libavcodec/lcldec.c | 4 ++-- libavcodec/mjpegdec.c | 2 +- libavcodec/xan.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 887a58599b..fd026acb8a 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -182,7 +182,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int from_y = offset / WIDTH; if (block_type == C93_4X4_FROM_CURR && from_y == y+j && (FFABS(from_x - x-i) < 4 || FFABS(from_x - x-i) > WIDTH-4)) { - avpriv_request_sample(avctx, "block overlap %d %d %d %d\n", from_x, x+i, from_y, y+j); + avpriv_request_sample(avctx, "block overlap %d %d %d %d", from_x, x+i, from_y, y+j); return AVERROR_INVALIDDATA; } if ((ret = copy_block(avctx, &out[j*stride+i], diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ff835abe33..21ef43f303 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -839,7 +839,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou /* Not touching AVSubtitles again*/ if(sub->num_rects) { - avpriv_request_sample(ctx, "Different Version of Segment asked Twice\n"); + avpriv_request_sample(ctx, "Different Version of Segment asked Twice"); return AVERROR_PATCHWELCOME; } for (display = ctx->display_list; display; display = display->next) { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 25653e085a..66c5375f41 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -658,13 +658,13 @@ static int get_poc(Jpeg2000DecoderContext *s, int size, Jpeg2000POC *p) } if (elem_size > 7) { - avpriv_request_sample(s->avctx, "Fat POC not supported\n"); + avpriv_request_sample(s->avctx, "Fat POC not supported"); return AVERROR_PATCHWELCOME; } tmp.nb_poc = (size - 2) / elem_size; if (tmp.nb_poc > MAX_POCS) { - avpriv_request_sample(s->avctx, "Too many POCs (%d)\n", tmp.nb_poc); + avpriv_request_sample(s->avctx, "Too many POCs (%d)", tmp.nb_poc); return AVERROR_PATCHWELCOME; } @@ -951,14 +951,14 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, return newpasses; av_assert2(newpasses > 0); if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) { - avpriv_request_sample(s->avctx, "Too many passes\n"); + avpriv_request_sample(s->avctx, "Too many passes"); return AVERROR_PATCHWELCOME; } if ((llen = getlblockinc(s)) < 0) return llen; if (cblk->lblock + llen + av_log2(newpasses) > 16) { avpriv_request_sample(s->avctx, - "Block with length beyond 16 bits\n"); + "Block with length beyond 16 bits"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index a774832434..c04ed5e6ca 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -512,7 +512,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV422P; av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:2.\n"); if (avctx->width % 4) { - avpriv_request_sample(avctx, "Unsupported dimensions\n"); + avpriv_request_sample(avctx, "Unsupported dimensions"); return AVERROR_INVALIDDATA; } break; @@ -547,7 +547,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &subsample_h, &subsample_v); if (avctx->width % (1<<subsample_h) || avctx->height % (1<<subsample_v)) { - avpriv_request_sample(avctx, "Unsupported dimensions\n"); + avpriv_request_sample(avctx, "Unsupported dimensions"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ad618e25c9..899af4e6a6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -289,7 +289,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) width = get_bits(&s->gb, 16); if (s->avctx->codec_id == AV_CODEC_ID_AMV && (height&15)) - avpriv_request_sample(s->avctx, "non mod 16 height AMV\n"); + avpriv_request_sample(s->avctx, "non mod 16 height AMV"); // HACK for odd_height.mov if (s->interlaced && s->width == width && s->height == height + 1) diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 7184faa957..662386af9a 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -263,7 +263,7 @@ static inline void xan_wc3_copy_pixel_run(XanContext *s, AVFrame *frame, prevframe_x = x + motion_x; if (prev_palette_plane == palette_plane && FFABS(curframe_index - prevframe_index) < pixel_count) { - avpriv_request_sample(s->avctx, "Overlapping copy\n"); + avpriv_request_sample(s->avctx, "Overlapping copy"); return ; } -- cgit v1.2.3