[vlc-commits] codec/mediacodec: remove useless code
Thomas Guillem
git at videolan.org
Tue Dec 13 17:11:04 CET 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Dec 13 09:32:29 2016 +0100| [6ba9be2957d81194e6a6c091541e4432f9a60eb8] | committer: Thomas Guillem
codec/mediacodec: remove useless code
In case of direct_rendering, i_codec is already set to
VLC_CODEC_ANDROID_OPAQUE.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ba9be2957d81194e6a6c091541e4432f9a60eb8
---
modules/codec/omxil/mediacodec.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index b46fca5..27e0614 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -1012,15 +1012,12 @@ static int Video_ProcessOutput(decoder_t *p_dec, mc_api_out *p_out,
p_sys->video.i_pixel_format = p_out->conf.video.pixel_format;
const char *name = "unknown";
- if (p_sys->api->b_direct_rendering)
- p_dec->fmt_out.i_codec = VLC_CODEC_ANDROID_OPAQUE;
- else
+ if (!p_sys->api->b_direct_rendering
+ && !GetVlcChromaFormat(p_sys->video.i_pixel_format,
+ &p_dec->fmt_out.i_codec, &name))
{
- if (!GetVlcChromaFormat(p_sys->video.i_pixel_format,
- &p_dec->fmt_out.i_codec, &name)) {
- msg_Err(p_dec, "color-format not recognized");
- return -1;
- }
+ msg_Err(p_dec, "color-format not recognized");
+ return -1;
}
msg_Err(p_dec, "output: %d %s, %dx%d stride %d %d, crop %d %d %d %d",
More information about the vlc-commits
mailing list