From 82d99257f2f2a009bd3f9cde4375e141fbf85827 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Mon, 5 Dec 2011 11:22:35 -0800 Subject: [PATCH] removed leftover code from a couple merge problems. Change-Id: I17d9c1246d69e102297ec1c3efb359691b3da313 --- vp8/decoder/onyxd_if.c | 8 -------- vp8/encoder/onyx_if.c | 6 ------ 2 files changed, 14 deletions(-) diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 7862cbf90..ed7baac3e 100644 --- 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 829906a1c..4a6b7617d 100644 --- 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 -- 2.50.1