summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2011-11-16 10:34:47 +0000
committerPaul Wilkins <paulwilkins@google.com>2011-11-16 10:34:47 +0000
commitcee3d2223ab302c00585116e52a70856b7802cf5 (patch)
tree2ae619ef5bd1f761bc6bb8de1765d354a39017da
parent3cdfdb55e4b726c47ecef70fe8b6362438cdae1c (diff)
downloadlibvpx-cee3d2223ab302c00585116e52a70856b7802cf5.tar
libvpx-cee3d2223ab302c00585116e52a70856b7802cf5.tar.gz
libvpx-cee3d2223ab302c00585116e52a70856b7802cf5.tar.bz2
libvpx-cee3d2223ab302c00585116e52a70856b7802cf5.zip
Header inclusion for Unix build
Explicit inclusion of limits.h to satisfy unix build for definition of INT_MAX. Some commented out code removed. Change-Id: I5b5980dfaa9b4d2d12bfd729cfd35bd982106908
-rw-r--r--vp8/encoder/encodeframe.c8
-rw-r--r--vp8/encoder/segmentation.c3
2 files changed, 2 insertions, 9 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 860beb4ad..7a8683a9d 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1069,14 +1069,6 @@ void vp8_encode_frame(VP8_COMP *cpi)
}
- // Work out the segment probabilites if segmentation is enabled and
- // the map is due to be updated
- //if (xd->segmentation_enabled && xd->update_mb_segmentation_map)
- //{
- // // Select the coding strategy for the segment map (temporal or spatial)
- // choose_segmap_coding_method( cpi );
- //}
-
// 256 rate units to the bit
cpi->projected_frame_size = totalrate >> 8; // projected_frame_size in units of BYTES
diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c
index da6c68648..516a41554 100644
--- a/vp8/encoder/segmentation.c
+++ b/vp8/encoder/segmentation.c
@@ -9,8 +9,9 @@
*/
-#include "segmentation.h"
+#include "limits.h"
#include "vpx_mem/vpx_mem.h"
+#include "segmentation.h"
void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x)
{