am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on...
am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit '17fa4ab4':
mediacodec: Return an error on getOutputFormat if there is no output format yet