diff options
| author | Streetwalrus Einstein <streetwalrus@codewalr.us> | 2015-12-01 14:25:44 +0200 |
|---|---|---|
| committer | Streetwalrus Einstein <streetwalrus@codewalr.us> | 2015-12-01 14:25:44 +0200 |
| commit | 42b053206af6c36d3e5490469f72ba514fce32d0 (patch) | |
| tree | d97e1bafc60749e06b8c7c09ed942cc6f0304a3b | |
| parent | 68a6c624e00a5dc24839fcf9a8b545c01905516f (diff) | |
media_codecs: clean up ffmpeg codecs
These are already provided by media_codecs_ffmpeg.xml and they prevent
stagefright from initializing properly, causing most media playback and
video recording to be broken.
Change-Id: I0c26d1084d12b62243fd90fe8e35e7fb9c168fee
| -rw-r--r-- | media_codecs.xml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/media_codecs.xml b/media_codecs.xml index 72130ec..6bcd16d 100644 --- a/media_codecs.xml +++ b/media_codecs.xml @@ -106,26 +106,6 @@ <Feature name="adaptive-playback" /> <Limit name="concurrent-instances" max="4" /> </MediaCodec> - - <!-- ffmpeg audio codecs --> - <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/> - <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/> - <MediaCodec name="OMX.ffmpeg.mp2.decoder" type="audio/mpeg-L2"/> - <MediaCodec name="OMX.ffmpeg.ac3.decoder" type="audio/ac3"/> - <MediaCodec name="OMX.ffmpeg.ape.decoder" type="audio/x-ape"/> - <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/vnd.dts"/> - <MediaCodec name="OMX.ffmpeg.atrial.decoder" type="audio/ffmpeg"/> - - <!-- ffmpeg video codecs --> - <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/> - <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/> - <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/> - <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/> - <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/> - <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/> - <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/> - <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/> - </Decoders> <Include href="media_codecs_google_video.xml" /> <Include href="media_codecs_ffmpeg.xml" /> |