diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:48:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:48:23 +0100 |
| commit | c09eeca5468ca03cc5733f08dc6303b4aef2c2c1 (patch) | |
| tree | 4cb9bc74bdd24febb33f737eb4d8206f0c6f803a /libavcodec/allcodecs.c | |
| parent | cb03d29dec649efb03b895810f610e61d70800ca (diff) | |
| parent | 8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4 (diff) | |
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
libavcodec: Add an OpenH264 encoder wrapper
Conflicts:
Changelog
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 8ceee2f1e4..053bca4f3b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -511,6 +511,7 @@ 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); |