diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-12-05 11:22:35 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-12-05 11:22:35 -0800 |
| commit | 82d99257f2f2a009bd3f9cde4375e141fbf85827 (patch) | |
| tree | 6783e13b0144272f1724a110a9ef58f1a688cf65 | |
| parent | 8a40d2f5e640d0b1447f88a31eee2c8cc8066f5f (diff) | |
| download | libvpx-82d99257f2f2a009bd3f9cde4375e141fbf85827.tar libvpx-82d99257f2f2a009bd3f9cde4375e141fbf85827.tar.gz libvpx-82d99257f2f2a009bd3f9cde4375e141fbf85827.tar.bz2 libvpx-82d99257f2f2a009bd3f9cde4375e141fbf85827.zip | |
removed leftover code from a couple merge problems.
Change-Id: I17d9c1246d69e102297ec1c3efb359691b3da313
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 8 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
2 files changed, 0 insertions, 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 |