Merge "Change to fourcc to enable decoding of ffmpeg files." into experimental
authorJames Zern <jzern@google.com>
Wed, 1 May 2013 21:58:36 +0000 (14:58 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 1 May 2013 21:58:36 +0000 (14:58 -0700)

Trivial merge