Merge "Handle setDataSource failures properly. #5261671"
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index d5b013d..fb49d7b 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2442,8 +2442,10 @@
// Don't notify clients if the output port settings change
// wasn't of importance to them, i.e. it may be that just the
// number of buffers has changed and nothing else.
- mOutputPortSettingsHaveChanged =
- formatHasNotablyChanged(oldOutputFormat, mOutputFormat);
+ bool formatChanged = formatHasNotablyChanged(oldOutputFormat, mOutputFormat);
+ if (!mOutputPortSettingsHaveChanged) {
+ mOutputPortSettingsHaveChanged = formatChanged;
+ }
enablePortAsync(portIndex);