Commit 20b2c717 authored by kostya's avatar kostya

cosmetics: reindent

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20919 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ec6213f7
...@@ -77,11 +77,11 @@ typedef struct IpvideoContext { ...@@ -77,11 +77,11 @@ typedef struct IpvideoContext {
} IpvideoContext; } IpvideoContext;
#define CHECK_STREAM_PTR(n) \ #define CHECK_STREAM_PTR(n) \
if (s->stream_end - s->stream_ptr < n) { \ if (s->stream_end - s->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, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
s->stream_ptr + n, s->stream_end); \ s->stream_ptr + n, s->stream_end); \
return -1; \ return -1; \
} }
static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y) static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
{ {
...@@ -591,20 +591,20 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) ...@@ -591,20 +591,20 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
opcode = get_bits(&gb, 4); opcode = get_bits(&gb, 4);
debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
x - y, y / s->stride, opcode, s->stream_ptr); x - y, y / s->stride, opcode, s->stream_ptr);
s->pixel_ptr = s->current_frame.data[0] + x; s->pixel_ptr = s->current_frame.data[0] + x;
ret = ipvideo_decode_block[opcode](s); ret = ipvideo_decode_block[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, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n",
frame, x - y, y / s->stride); frame, x - y, y / s->stride);
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, " Interplay video: decode finished with %td bytes left over\n",
s->stream_end - s->stream_ptr); s->stream_end - s->stream_ptr);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment