Commit 82d99257 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

removed leftover code from a couple merge problems.

Change-Id: I17d9c1246d69e102297ec1c3efb359691b3da313
parent 8a40d2f5
......@@ -117,8 +117,6 @@ void write_dx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame)
}
#endif
void vp8dx_initialize()
{
static int init_done = 0;
......@@ -583,17 +581,11 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign
#if WRITE_RECON_BUFFER
if(cm->show_frame)
<<<<<<< HEAD
write_dx_frame_to_file(cm->frame_to_show, cm->current_video_frame);
else
write_dx_frame_to_file(cm->frame_to_show, cm->current_video_frame+1000);
=======
write_dx_frame_to_file(cm->frame_to_show,
cm->current_video_frame);
else
write_dx_frame_to_file(cm->frame_to_show,
cm->current_video_frame+1000);
>>>>>>> added separate entropy context for alt_ref
#endif
if(cm->filter_level)
......
......@@ -4521,17 +4521,11 @@ static void encode_frame_to_data_rate
#if WRITE_RECON_BUFFER
if(cm->show_frame)
<<<<<<< HEAD
write_cx_frame_to_file(cm->frame_to_show, cm->current_video_frame);
else
write_cx_frame_to_file(cm->frame_to_show, cm->current_video_frame+1000);
=======
write_cx_frame_to_file(cm->frame_to_show,
cm->current_video_frame);
else
write_cx_frame_to_file(cm->frame_to_show,
cm->current_video_frame+1000);
>>>>>>> added separate entropy context for alt_ref
#endif
#if CONFIG_MULTITHREAD
......
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