Index: source/libvpx/examples.mk |
=================================================================== |
--- source/libvpx/examples.mk (revision 263011) |
+++ source/libvpx/examples.mk (working copy) |
@@ -26,16 +26,18 @@ |
vpxdec.SRCS += args.c args.h |
vpxdec.SRCS += ivfdec.c ivfdec.h |
vpxdec.SRCS += tools_common.c tools_common.h |
-vpxdec.SRCS += webmdec.c webmdec.h |
vpxdec.SRCS += y4menc.c y4menc.h |
-vpxdec.SRCS += third_party/nestegg/halloc/halloc.h |
-vpxdec.SRCS += third_party/nestegg/halloc/src/align.h |
-vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c |
-vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h |
-vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h |
-vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h |
-vpxdec.SRCS += third_party/nestegg/src/nestegg.c |
vpxdec.SRCS += $(LIBYUV_SRCS) |
+ifeq ($(CONFIG_WEBM_IO),yes) |
+ vpxdec.SRCS += third_party/nestegg/halloc/halloc.h |
+ vpxdec.SRCS += third_party/nestegg/halloc/src/align.h |
+ vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c |
+ vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h |
+ vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h |
+ vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h |
+ vpxdec.SRCS += third_party/nestegg/src/nestegg.c |
+ vpxdec.SRCS += webmdec.c webmdec.h |
+endif |
vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 |
vpxdec.DESCRIPTION = Full featured decoder |
UTILS-$(CONFIG_ENCODERS) += vpxenc.c |
@@ -45,15 +47,17 @@ |
vpxenc.SRCS += rate_hist.c rate_hist.h |
vpxenc.SRCS += tools_common.c tools_common.h |
vpxenc.SRCS += warnings.c warnings.h |
-vpxenc.SRCS += webmenc.c webmenc.h |
vpxenc.SRCS += vpx_ports/mem_ops.h |
vpxenc.SRCS += vpx_ports/mem_ops_aligned.h |
vpxenc.SRCS += vpx_ports/vpx_timer.h |
vpxenc.SRCS += vpxstats.c vpxstats.h |
-vpxenc.SRCS += third_party/libmkv/EbmlIDs.h |
-vpxenc.SRCS += third_party/libmkv/EbmlWriter.c |
-vpxenc.SRCS += third_party/libmkv/EbmlWriter.h |
vpxenc.SRCS += $(LIBYUV_SRCS) |
+ifeq ($(CONFIG_WEBM_IO),yes) |
+ vpxenc.SRCS += third_party/libmkv/EbmlIDs.h |
+ vpxenc.SRCS += third_party/libmkv/EbmlWriter.c |
+ vpxenc.SRCS += third_party/libmkv/EbmlWriter.h |
+ vpxenc.SRCS += webmenc.c webmenc.h |
+endif |
vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 |
vpxenc.DESCRIPTION = Full featured encoder |
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_scalable_encoder.c |
@@ -62,11 +66,12 @@ |
vp9_spatial_scalable_encoder.SRCS += tools_common.c tools_common.h |
vp9_spatial_scalable_encoder.SRCS += video_common.h |
vp9_spatial_scalable_encoder.SRCS += video_writer.h video_writer.c |
+vp9_spatial_scalable_encoder.SRCS += vpxstats.c vpxstats.h |
vp9_spatial_scalable_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D |
vp9_spatial_scalable_encoder.DESCRIPTION = Spatial Scalable Encoder |
-ifeq ($(CONFIG_SHARED),no) |
-UTILS-$(CONFIG_VP9_ENCODER) += resize_util.c |
+ifneq ($(CONFIG_SHARED),yes) |
+EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c |
endif |
# XMA example disabled for now, not used in VP8 |
@@ -123,9 +128,6 @@ |
twopass_encoder.SRCS += video_writer.h video_writer.c |
twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8 |
twopass_encoder.DESCRIPTION = Two-pass encoder loop |
-EXAMPLES-$(CONFIG_VP8_ENCODER) += force_keyframe.c |
-force_keyframe.GUID = 3C67CADF-029F-4C86-81F5-D6D4F51177F0 |
-force_keyframe.DESCRIPTION = Force generation of keyframes |
ifeq ($(CONFIG_DECODERS),yes) |
EXAMPLES-$(CONFIG_VP8_ENCODER) += decode_with_drops.c |
decode_with_drops.SRCS += ivfdec.h ivfdec.c |
@@ -142,14 +144,18 @@ |
endif |
decode_with_partial_drops.GUID = 61C2D026-5754-46AC-916F-1343ECC5537E |
decode_with_partial_drops.DESCRIPTION = Drops parts of frames while decoding |
-EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_set_maps.c |
-vp8_set_maps.SRCS += ivfenc.h ivfenc.c |
-vp8_set_maps.SRCS += tools_common.h tools_common.c |
-vp8_set_maps.SRCS += video_common.h |
-vp8_set_maps.SRCS += video_writer.h video_writer.c |
-vp8_set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F |
-vp8_set_maps.DESCRIPTION = VP8 set active and ROI maps |
+EXAMPLES-$(CONFIG_ENCODERS) += set_maps.c |
+set_maps.SRCS += ivfenc.h ivfenc.c |
+set_maps.SRCS += tools_common.h tools_common.c |
+set_maps.SRCS += video_common.h |
+set_maps.SRCS += video_writer.h video_writer.c |
+set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F |
+set_maps.DESCRIPTION = Set active and ROI maps |
EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8cx_set_ref.c |
+vp8cx_set_ref.SRCS += ivfenc.h ivfenc.c |
+vp8cx_set_ref.SRCS += tools_common.h tools_common.c |
+vp8cx_set_ref.SRCS += video_common.h |
+vp8cx_set_ref.SRCS += video_writer.h video_writer.c |
vp8cx_set_ref.GUID = C5E31F7F-96F6-48BD-BD3E-10EBF6E8057A |
vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame |