Commit 9bb8e65a authored Apr 13, 2010 by James Dong Committed by Android Git Automerger Apr 13, 2010

am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo

Merge commit 'c15f48d7' into froyo-plus-aosp

* commit 'c15f48d7':
  Don't set encoder component role while we query decoders

media/libstagefright/OMXCodec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -3040,7 +3040,7 @@ status_t QueryCodecs(
		continue;
		}

		OMXCodec::setComponentRole(omx, node, queryDecoders, mime);
		OMXCodec::setComponentRole(omx, node, !queryDecoders, mime);

		results->push();
		CodecCapabilities *caps = &results->editItemAt(results->size() - 1);