tree e73acabfe7133937aa6bb5b923fb6e2b019d1369
parent 5fcc14ec6217e972808e65fdd6c08a950401ea6d
parent f4d8fad802b59d3099eb453dcafb08219ecfa22c
author Dale Sather <dalesat@google.com> 1591123579 -0700
committer Dale Sather <dalesat@google.com> 1591132912 -0700

[ffmpeg] upstream merge and related gn files update

Test: built locally and ran mediaplayer_tests

Fixed: 51657

Change-Id: I8f34cefc94e4376bff75997b097afc68be7c0999