Merge "Changing the order switchable filter enum constants."

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge