Fix for frame resolution in encoded frame callback.
Fix for frame resolution in encoded frame callback.

Scaled resolution for down scaled frames by the quality scaler is not used.

BUG=webrtc:4966
R=pbos@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1317463005 .

Cr-Original-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#9873}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 110443c1ec40b764db81a6b9679885aec3e4a218

aleonliao/webrtc-trunk,Alkalyne/webrtctrunk,jchavanton/webrtc,Alkalyne/webrtctrunk,Alkalyne/webrtctrunk,jchavanton/webrtc,Alkalyne/webrtctrunk,Alkalyne/webrtctrunk,aleonliao/webrtc-trunk,Alkalyne/webrtctrunk,jchavanton/webrtc,aleonliao/webrtc-trunk,aleonliao/webrtc-trunk,sippet/webrtc,Alkalyne/webrtctrunk,jchavanton/webrtc,jchavanton/webrtc,jchavanton/webrtc,aleonliao/webrtc-trunk,sippet/webrtc,sippet/webrtc,aleonliao/webrtc-trunk,sippet/webrtc,jchavanton/webrtc,sippet/webrtc,sippet/webrtc,Alkalyne/webrtctrunk