[FFmpeg-cvslog] lavc/yop: remove redudant YOP in av_log() messages
Paul B Mahol
git at videolan.org
Fri Oct 19 02:08:49 CEST 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Oct 17 14:32:14 2012 +0000| [0bf40e0ef4218f96b465d5d619772f829d5cf73d] | committer: Paul B Mahol
lavc/yop: remove redudant YOP in av_log() messages
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bf40e0ef4218f96b465d5d619772f829d5cf73d
---
libavcodec/yop.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 2103628..255ed32 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -85,7 +85,6 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
if (avctx->width & 1 || avctx->height & 1 ||
av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
- av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n");
return -1;
}
@@ -104,7 +103,7 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
if (s->num_pal_colors + s->first_color[0] > 256 ||
s->num_pal_colors + s->first_color[1] > 256) {
av_log(avctx, AV_LOG_ERROR,
- "YOP: palette parameters invalid, header probably corrupt\n");
+ "Palette parameters invalid, header probably corrupt\n");
return AVERROR_INVALIDDATA;
}
@@ -147,8 +146,7 @@ static int yop_copy_previous_block(YopDecContext *s, int copy_tag)
bufptr = s->dstptr + motion_vector[copy_tag][0] +
s->frame.linesize[0] * motion_vector[copy_tag][1];
if (bufptr < s->dstbuf) {
- av_log(s->avctx, AV_LOG_ERROR,
- "YOP: cannot decode, file probably corrupt\n");
+ av_log(s->avctx, AV_LOG_ERROR, "File probably corrupt\n");
return AVERROR_INVALIDDATA;
}
More information about the ffmpeg-cvslog
mailing list