removed leftover code from a couple merge problems.

Change-Id: I17d9c1246d69e102297ec1c3efb359691b3da313

diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c
index 7862cbf900c7997b2b2fdfd5f18d3afdf58efd91..ed7baac3e32bef7f28bd6831f6405d6e84483e07 100644 (file)
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -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)

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 829906a1c33f646b7530d84cae4b343af17e1389..4a6b7617dd3384127293ca05e7e33f8fc64f5d63 100644 (file)
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -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