From ddae03f69bc1c6ec97c028c91837710944427b83 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 7 Jan 2015 01:15:57 +0100
Subject: [PATCH] avcodec/allcodecs: prefer x264 over openh264 if both are
available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/allcodecs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 053bca4f3b8..512711efc35 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -511,7 +511,6 @@ void avcodec_register_all(void)
REGISTER_ENCODER(LIBMP3LAME, libmp3lame);
REGISTER_ENCDEC (LIBOPENCORE_AMRNB, libopencore_amrnb);
REGISTER_DECODER(LIBOPENCORE_AMRWB, libopencore_amrwb);
- REGISTER_ENCODER(LIBOPENH264, libopenh264);
REGISTER_ENCDEC (LIBOPENJPEG, libopenjpeg);
REGISTER_ENCDEC (LIBOPUS, libopus);
REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger);
@@ -535,6 +534,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(LIBXVID, libxvid);
REGISTER_DECODER(LIBZVBI_TELETEXT, libzvbi_teletext);
REGISTER_ENCODER(LIBAACPLUS, libaacplus);
+ REGISTER_ENCODER(LIBOPENH264, libopenh264);
/* text */
REGISTER_DECODER(BINTEXT, bintext);
--
GitLab