| 
																	
																	
																		
																	
																	
																 | 
																@@ -133,7 +133,7 @@ static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																        y =   8 + ((B - 56) / 29); | 
																 | 
																 | 
																        y =   8 + ((B - 56) / 29); | 
															
														
														
													
														
															
																 | 
																 | 
																    } | 
																 | 
																 | 
																    } | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																    return copy_from(s, &s->second_last_frame, x, y); | 
																 | 
																 | 
																    return copy_from(s, &s->second_last_frame, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																		
																	
																	
																 | 
																@@ -161,7 +161,7 @@ static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																        y = -(  8 + ((B - 56) / 29)); | 
																 | 
																 | 
																        y = -(  8 + ((B - 56) / 29)); | 
															
														
														
													
														
															
																 | 
																 | 
																    } | 
																 | 
																 | 
																    } | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																    return copy_from(s, &s->current_frame, x, y); | 
																 | 
																 | 
																    return copy_from(s, &s->current_frame, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
												
													
														
															
																| 
																	
																	
																	
																		
																	
																 | 
																@@ -184,7 +184,7 @@ static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																    x = -8 + BL; | 
																 | 
																 | 
																    x = -8 + BL; | 
															
														
														
													
														
															
																 | 
																 | 
																    y = -8 + BH; | 
																 | 
																 | 
																    y = -8 + BH; | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "    motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																    return copy_from(s, &s->last_frame, x, y); | 
																 | 
																 | 
																    return copy_from(s, &s->last_frame, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
												
													
														
															
																| 
																	
																	
																	
																		
																	
																 | 
																@@ -199,7 +199,7 @@ static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																    x = *s->stream_ptr++; | 
																 | 
																 | 
																    x = *s->stream_ptr++; | 
															
														
														
													
														
															
																 | 
																 | 
																    y = *s->stream_ptr++; | 
																 | 
																 | 
																    y = *s->stream_ptr++; | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "    motion bytes = %d, %d\n", x, y); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "motion bytes = %d, %d\n", x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																    return copy_from(s, &s->last_frame, x, y); | 
																 | 
																 | 
																    return copy_from(s, &s->last_frame, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																		
																	
																	
																 | 
																@@ -580,7 +580,7 @@ static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																    x = *s->stream_ptr++; | 
																 | 
																 | 
																    x = *s->stream_ptr++; | 
															
														
														
													
														
															
																 | 
																 | 
																    y = *s->stream_ptr++; | 
																 | 
																 | 
																    y = *s->stream_ptr++; | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "    motion bytes = %d, %d\n", x, y); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "motion bytes = %d, %d\n", x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																    return copy_from(s, &s->second_last_frame, x, y); | 
																 | 
																 | 
																    return copy_from(s, &s->second_last_frame, x, y); | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																		
																	
																	
																 | 
																@@ -957,7 +957,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																    static int frame = 0; | 
																 | 
																 | 
																    static int frame = 0; | 
															
														
														
													
														
															
																 | 
																 | 
																    GetBitContext gb; | 
																 | 
																 | 
																    GetBitContext gb; | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    av_dlog(NULL, "------------------ frame %d\n", frame); | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    av_dlog(s->avctx, "frame %d\n", frame); | 
															
														
														
													
														
															
																 | 
																 | 
																    frame++; | 
																 | 
																 | 
																    frame++; | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																    if (!s->is_16bpp) { | 
																 | 
																 | 
																    if (!s->is_16bpp) { | 
															
														
														
													
												
													
														
															
																| 
																	
																	
																	
																		
																	
																 | 
																@@ -983,7 +983,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) | 
															
														
														
													
														
															
																 | 
																 | 
																        for (x = 0; x < s->avctx->width; x += 8) { | 
																 | 
																 | 
																        for (x = 0; x < s->avctx->width; x += 8) { | 
															
														
														
													
														
															
																 | 
																 | 
																            opcode = get_bits(&gb, 4); | 
																 | 
																 | 
																            opcode = get_bits(&gb, 4); | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																            av_dlog(NULL, "  block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																            av_dlog(s->avctx, "block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", | 
															
														
														
													
														
															
																 | 
																 | 
																                    x, y, opcode, s->stream_ptr); | 
																 | 
																 | 
																                    x, y, opcode, s->stream_ptr); | 
															
														
														
													
														
															
																 | 
																 | 
																
  | 
																 | 
																 | 
																
  | 
															
														
														
													
														
															
																 | 
																 | 
																            if (!s->is_16bpp) { | 
																 | 
																 | 
																            if (!s->is_16bpp) { | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																	
																 | 
																
  |