diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-09-11 15:46:37 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-09-11 15:46:37 -0700 |
| commit | 5ba8c79869de732cd792e02e3ea0fe0a06e49e61 (patch) | |
| tree | aeca564188b44a6bd7783d73acb47899ce4a84f2 /examples.mk | |
| parent | e9b6c5f6eb2016aa20e62ead39edf0ce50e7cff8 (diff) | |
| download | libvpx-5ba8c79869de732cd792e02e3ea0fe0a06e49e61.tar libvpx-5ba8c79869de732cd792e02e3ea0fe0a06e49e61.tar.gz libvpx-5ba8c79869de732cd792e02e3ea0fe0a06e49e61.tar.bz2 libvpx-5ba8c79869de732cd792e02e3ea0fe0a06e49e61.zip | |
Enabling example code build for both VP8 and VP9.
Change-Id: I1bf7e34e6735461e4e587b6b806c2abc3fe63013
Diffstat (limited to 'examples.mk')
| -rw-r--r-- | examples.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/examples.mk b/examples.mk index d400fe05f..fd67a44df 100644 --- a/examples.mk +++ b/examples.mk @@ -114,7 +114,7 @@ vpx_temporal_svc_encoder.SRCS += video_common.h vpx_temporal_svc_encoder.SRCS += video_writer.h video_writer.c vpx_temporal_svc_encoder.GUID = B18C08F2-A439-4502-A78E-849BE3D60947 vpx_temporal_svc_encoder.DESCRIPTION = Temporal SVC Encoder -EXAMPLES-$(CONFIG_VP8_DECODER) += simple_decoder.c +EXAMPLES-$(CONFIG_DECODERS) += simple_decoder.c simple_decoder.GUID = D3BBF1E9-2427-450D-BBFF-B2843C1D44CC simple_decoder.SRCS += ivfdec.h ivfdec.c simple_decoder.SRCS += tools_common.h tools_common.c @@ -123,7 +123,7 @@ simple_decoder.SRCS += video_reader.h video_reader.c simple_decoder.SRCS += vpx_ports/mem_ops.h simple_decoder.SRCS += vpx_ports/mem_ops_aligned.h simple_decoder.DESCRIPTION = Simplified decoder loop -EXAMPLES-$(CONFIG_VP8_DECODER) += postproc.c +EXAMPLES-$(CONFIG_DECODERS) += postproc.c postproc.SRCS += ivfdec.h ivfdec.c postproc.SRCS += tools_common.h tools_common.c postproc.SRCS += video_common.h @@ -132,7 +132,7 @@ postproc.SRCS += vpx_ports/mem_ops.h postproc.SRCS += vpx_ports/mem_ops_aligned.h postproc.GUID = 65E33355-F35E-4088-884D-3FD4905881D7 postproc.DESCRIPTION = Decoder postprocessor control -EXAMPLES-$(CONFIG_VP8_DECODER) += decode_to_md5.c +EXAMPLES-$(CONFIG_DECODERS) += decode_to_md5.c decode_to_md5.SRCS += md5_utils.h md5_utils.c decode_to_md5.SRCS += ivfdec.h ivfdec.c decode_to_md5.SRCS += tools_common.h tools_common.c @@ -142,7 +142,7 @@ decode_to_md5.SRCS += vpx_ports/mem_ops.h decode_to_md5.SRCS += vpx_ports/mem_ops_aligned.h decode_to_md5.GUID = 59120B9B-2735-4BFE-B022-146CA340FE42 decode_to_md5.DESCRIPTION = Frame by frame MD5 checksum -EXAMPLES-$(CONFIG_VP8_ENCODER) += simple_encoder.c +EXAMPLES-$(CONFIG_ENCODERS) += simple_encoder.c simple_encoder.SRCS += ivfenc.h ivfenc.c simple_encoder.SRCS += tools_common.h tools_common.c simple_encoder.SRCS += video_common.h @@ -156,22 +156,20 @@ vp9_lossless_encoder.SRCS += video_common.h vp9_lossless_encoder.SRCS += video_writer.h video_writer.c vp9_lossless_encoder.GUID = B63C7C88-5348-46DC-A5A6-CC151EF93366 vp9_lossless_encoder.DESCRIPTION = Simplified lossless VP9 encoder -EXAMPLES-$(CONFIG_VP8_ENCODER) += twopass_encoder.c +EXAMPLES-$(CONFIG_ENCODERS) += twopass_encoder.c twopass_encoder.SRCS += ivfenc.h ivfenc.c twopass_encoder.SRCS += tools_common.h tools_common.c twopass_encoder.SRCS += video_common.h twopass_encoder.SRCS += video_writer.h video_writer.c twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8 twopass_encoder.DESCRIPTION = Two-pass encoder loop -ifeq ($(CONFIG_DECODERS),yes) -EXAMPLES-$(CONFIG_VP8_ENCODER) += decode_with_drops.c +EXAMPLES-$(CONFIG_DECODERS) += decode_with_drops.c decode_with_drops.SRCS += ivfdec.h ivfdec.c decode_with_drops.SRCS += tools_common.h tools_common.c decode_with_drops.SRCS += video_common.h decode_with_drops.SRCS += video_reader.h video_reader.c decode_with_drops.SRCS += vpx_ports/mem_ops.h decode_with_drops.SRCS += vpx_ports/mem_ops_aligned.h -endif decode_with_drops.GUID = CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26 decode_with_drops.DESCRIPTION = Drops frames while decoding EXAMPLES-$(CONFIG_ENCODERS) += set_maps.c |