RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-17 12:37:01 +00:00
Code Issues Projects Releases Wiki Activity

interplayvideo: remove superfluous strings from av_log()

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Paul B Mahol 2012-03-23 17:17:36 +00:00 committed by Michael Niedermayer
parent a0b07b8fc5
commit 0c57f8197c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/interplayvideo.c
View File

@ -74,7 +74,7 @@ typedef struct IpvideoContext {
#define CHECK_STREAM_PTR(stream_ptr, stream_end, n) \ #define CHECK_STREAM_PTR(stream_ptr, stream_end, n) \
if (stream_end - stream_ptr < n) { \ if (stream_end - stream_ptr < n) { \
av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \ av_log(s->avctx, AV_LOG_ERROR, "stream_ptr out of bounds (%p >= %p)\n", \
stream_ptr + n, stream_end); \ stream_ptr + n, stream_end); \
return -1; \ return -1; \
} }
@ -85,10 +85,10 @@ static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
int motion_offset = current_offset + delta_y * s->current_frame.linesize[0] int motion_offset = current_offset + delta_y * s->current_frame.linesize[0]
+ delta_x * (1 + s->is_16bpp); + delta_x * (1 + s->is_16bpp);
if (motion_offset < 0) { if (motion_offset < 0) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); av_log(s->avctx, AV_LOG_ERROR, "motion offset < 0 (%d)\n", motion_offset);
return -1; return -1;
} else if (motion_offset > s->upper_motion_limit_offset) { } else if (motion_offset > s->upper_motion_limit_offset) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", av_log(s->avctx, AV_LOG_ERROR, "motion offset above limit (%d >= %d)\n",
motion_offset, s->upper_motion_limit_offset); motion_offset, s->upper_motion_limit_offset);
return -1; return -1;
} }
@ -206,7 +206,7 @@ static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s)
static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s) static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s)
{ {
/* mystery opcode? skip multiple blocks? */ /* mystery opcode? skip multiple blocks? */
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n"); av_log(s->avctx, AV_LOG_ERROR, "Help! Mystery opcode 0x6 seen\n");
/* report success */ /* report success */
return 0; return 0;
@ -996,14 +996,14 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
ret = ipvideo_decode_block16[opcode](s); ret = ipvideo_decode_block16[opcode](s);
} }
if (ret != 0) { if (ret != 0) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", av_log(s->avctx, AV_LOG_ERROR, "decode problem on frame %d, @ block (%d, %d)\n",
frame, x, y); frame, x, y);
return; return;
} }
} }
} }
if (s->stream_end - s->stream_ptr > 1) { if (s->stream_end - s->stream_ptr > 1) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", av_log(s->avctx, AV_LOG_ERROR, "decode finished with %td bytes left over\n",
s->stream_end - s->stream_ptr); s->stream_end - s->stream_ptr);
} }
} }
@ -1051,7 +1051,7 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
s->current_frame.reference = 3; s->current_frame.reference = 3;
if (avctx->get_buffer(avctx, &s->current_frame)) { if (avctx->get_buffer(avctx, &s->current_frame)) {
av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }