Browse Source

lavc: Remove newline from avpriv_request_sample() calls.

tags/n2.8
Carl Eugen Hoyos 10 years ago
parent
commit
daf2c35f52
6 changed files with 10 additions and 10 deletions
  1. +1
    -1
      libavcodec/c93.c
  2. +1
    -1
      libavcodec/dvbsubdec.c
  3. +4
    -4
      libavcodec/jpeg2000dec.c
  4. +2
    -2
      libavcodec/lcldec.c
  5. +1
    -1
      libavcodec/mjpegdec.c
  6. +1
    -1
      libavcodec/xan.c

+ 1
- 1
libavcodec/c93.c View File

@@ -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],


+ 1
- 1
libavcodec/dvbsubdec.c View File

@@ -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) {


+ 4
- 4
libavcodec/jpeg2000dec.c View File

@@ -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;
}



+ 2
- 2
libavcodec/lcldec.c View File

@@ -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;
}



+ 1
- 1
libavcodec/mjpegdec.c View File

@@ -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)


+ 1
- 1
libavcodec/xan.c View File

@@ -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 ;
}



Loading…
Cancel
Save