Yaowu Xu 7c514e2dfd Merged branch 'master' into nextgenv2 ...

Resolved Conflicts in the following files:
        configure
        vp10/common/idct.c
        vp10/encoder/dct.c
        vp10/encoder/encodemb.c
        vp10/encoder/rdopt.c

Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316

2015-09-29 16:17:32 -07:00

..

decode_to_md5.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

decode_with_drops.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

postproc.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

resize_util.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

set_maps.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

simple_decoder.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

simple_encoder.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

twopass_encoder.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

vp8_multi_resolution_encoder.c

Merge changes from topic 'missing-proto'

2015-05-12 19:02:05 +00:00

vp8cx_set_ref.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

vp9_lossless_encoder.c

tools_common.h: fix usage_exit() prototype

2015-05-11 20:54:55 -07:00

vp9_spatial_svc_encoder.c

Merged branch 'master' into nextgenv2

2015-09-29 16:17:32 -07:00

vpx_temporal_svc_encoder.c

Update to vpx_temporal_svc_encoder:

2015-07-07 11:08:50 -07:00