From: Lajos Molnar <lajos@google.com>
Date: Fri, 4 Oct 2013 18:10:45 +0000 (-0700)
Subject: am 6d62af8b: am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port... 
X-Git-Tag: android-x86-6.0-r1~2749
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2f99bc37d173c598a7fb11c02acb1f0b6f93b37f;p=android-x86%2Fframeworks-av.git

am 6d62af8b: am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev

* commit '6d62af8bb4215de45a944ae94a641acab416960b':
  MediaCodec: avoid codec EOS if flushing during port reconfiguration
---

2f99bc37d173c598a7fb11c02acb1f0b6f93b37f