Remove legacy weirdness in Merge::Downsample
Remove legacy weirdness in Merge::Downsample

In practice, this will have only marginal effect. The length_limit
was increased from 6.7 ms to 10 ms. This is compared with the
input_length, which is equal to the decoded frame size. Thus,
this change will only affect encoded frame sizes in this range
(including 10 ms).

BUG=2696
R=tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/9969004

git-svn-id: 03ae4fbe531b1eefc9d815f31e49022782c42458@5700 4adac7df-926f-26a2-2b94-8c16560cd09d

AOSPU/external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,krieger-od/webrtc,krieger-od/nwjs_chromium_webrtc,jchavanton/webrtc,Omegaphora/external_chromium_org_third_party_webrtc,jchavanton/webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,jchavanton/webrtc,Alkalyne/webrtctrunk,jgcaaprom/android_external_chromium_org_third_party_webrtc,sippet/webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,aleonliao/webrtc-trunk,AOSPU/external_chromium_org_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,sippet/webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,aleonliao/webrtc-trunk,CyanogenMod/android_external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,jchavanton/webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,krieger-od/webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,Alkalyne/webrtctrunk,Alkalyne/webrtctrunk,AOSPU/external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,bpsinc-native/src_third_party_webrtc,krieger-od/webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,Alkalyne/webrtctrunk,sippet/webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,Alkalyne/webrtctrunk,svn2github/webrtc-Revision-8758,MIPS/external-chromium_org-third_party-webrtc,PersonifyInc/chromium_webrtc,MIPS/external-chromium_org-third_party-webrtc,AOSPU/external_chromium_org_third_party_webrtc,sippet/webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,MIPS/external-chromium_org-third_party-webrtc,bpsinc-native/src_third_party_webrtc,aleonliao/webrtc-trunk,Omegaphora/external_chromium_org_third_party_webrtc,sippet/webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,aleonliao/webrtc-trunk,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,android-ia/platform_external_chromium_org_third_party_webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,sippet/webrtc,krieger-od/nwjs_chromium_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,aleonliao/webrtc-trunk,android-ia/platform_external_chromium_org_third_party_webrtc,aleonliao/webrtc-trunk,android-ia/platform_external_chromium_org_third_party_webrtc,krieger-od/webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,krieger-od/webrtc,jchavanton/webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,Alkalyne/webrtctrunk,xin3liang/platform_external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,Alkalyne/webrtctrunk,krieger-od/webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,Omegaphora/external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,MIPS/external-chromium_org-third_party-webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,Alkalyne/webrtctrunk,jchavanton/webrtc,jchavanton/webrtc