shithub: libvpx

Download patch

ref: 82d99257f2f2a009bd3f9cde4375e141fbf85827
parent: 8a40d2f5e640d0b1447f88a31eee2c8cc8066f5f
author: Yaowu Xu <yaowu@google.com>
date: Mon Dec 5 06:22:35 EST 2011 

removed leftover code from a couple merge problems.

Change-Id: I17d9c1246d69e102297ec1c3efb359691b3da313


--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -117,8 +117,6 @@
 }
 #endif
 
-
-
 void vp8dx_initialize()
 {
     static int init_done = 0;
@@ -583,17 +581,11 @@
 
 #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)
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4521,17 +4521,11 @@
 
 #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
-- 
⑨