vpx/vp8/encoder
Johann 32a5c52856 Merge branch 'master' into experimental
Conflicts:
	vp9/common/vp9_findnearmv.c
	vp9/common/vp9_rtcd_defs.sh
	vp9/decoder/vp9_decodframe.c
	vp9/decoder/x86/vp9_dequantize_sse2.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_common.mk

Resolve file name changes in favor of master. Resolve rdopt changes in
favor of experimental, preserving the newer experiments.

Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f
2013-04-26 12:57:10 -07:00
..
arm support building vp8 and vp9 into a single lib 2012-11-15 10:46:17 -08:00
ppc Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
x86 Rename quantize_sse2_intrinsics.c 2013-04-24 09:08:56 -07:00
bitstream.c Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c" 2013-04-19 07:08:59 -07:00
bitstream.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
block.h Use intrinsics for sse2 regular quantize 2013-02-28 18:06:15 -08:00
boolhuff.c ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
boolhuff.h ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
dct_value_cost.h Make global data const 2012-05-04 10:42:21 -07:00
dct_value_tokens.h Make global data const 2012-05-04 10:42:21 -07:00
dct.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
defaultcoefcounts.h removed duplicate a head file 2012-03-07 07:21:46 -08:00
denoising.c Removed shadow warnings : postproc.c decodframe.c threading.c 2013-03-14 14:45:23 -07:00
denoising.h Encoder denoiser performance improvement 2012-08-31 13:48:13 -07:00
encodeframe.c Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c" 2013-04-19 07:08:59 -07:00
encodeframe.h Formalize encodeframe.c forward delclarations 2012-05-04 10:44:47 -07:00
encodeintra.c support building vp8 and vp9 into a single lib 2012-11-15 10:46:17 -08:00
encodeintra.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
encodemb.c support building vp8 and vp9 into a single lib 2012-11-15 10:46:17 -08:00
encodemb.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
encodemv.c ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
encodemv.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
ethreading.c Moved error_bins to macroblock struct 2012-12-10 17:32:58 -08:00
firstpass.c firstpass.c: correct casting around gf_group_bits 2013-02-28 15:45:29 -08:00
firstpass.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
lookahead.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
lookahead.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
mcomp.c Merge "Removed shadow warnings : mcomp.c rdopt.c" 2013-04-19 07:16:34 -07:00
mcomp.h ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
modecosts.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
modecosts.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
mr_dissim.c multi-res: add drop_frame support 2012-07-26 08:36:53 -07:00
mr_dissim.h multi-res: add drop_frame support 2012-07-26 08:36:53 -07:00
onyx_if.c Merge branch 'master' into experimental 2013-04-26 12:57:10 -07:00
onyx_int.h Removed mode_chosen_counts 2013-03-20 14:41:24 -07:00
pickinter.c Fix for multi-res-encoding: 2013-04-11 21:56:23 -07:00
pickinter.h Removed unnecessary VP8_COMP *cpi parameters 2012-11-02 12:10:07 -07:00
picklpf.c Use 'vpx_scale' consistently 2012-12-05 16:05:44 -08:00
psnr.c Changed MAX_PSNR to 100 2012-12-18 14:36:20 -08:00
psnr.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
quantize.c Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c 2013-03-14 09:49:38 -07:00
quantize.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
ratectrl.c Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c 2013-03-14 09:49:38 -07:00
ratectrl.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
rdopt.c Merge "Removed shadow warnings : mcomp.c rdopt.c" 2013-04-19 07:16:34 -07:00
rdopt.h Moving rd_thresh_mult, rd_threshes to macroblock struct 2012-11-06 16:27:00 -08:00
segmentation.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
segmentation.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
ssim.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
temporal_filter.c Use 'vpx_scale' consistently 2012-12-05 16:05:44 -08:00
tokenize.c ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
tokenize.h ENTROPY_STATS -> VP8_ENTROPY_STATS in vp8/. 2013-03-18 15:39:04 -07:00
treewriter.c Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
treewriter.h Rename vp8/ codec directory to vp9/. 2012-11-01 16:31:22 -07:00
vp8_asm_enc_offsets.c prefix vp8 asm_{com,dec,enc}_offsets files 2013-03-02 14:45:40 -08:00