diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:21:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:21:03 +0200 |
| commit | e56f14659f580954626e8c1660771c593ecd74fa (patch) | |
| tree | c2c0eeb1f93092778165d4812316df3df2d65ff8 /libavcodec/allcodecs.c | |
| parent | 4c7c0d37e5c2ad5b046d1f543e47850c8b94403d (diff) | |
| parent | e1319aa1c1be9b64117c19170344fb78841dd67c (diff) | |
| download | ffmpeg-e56f14659f580954626e8c1660771c593ecd74fa.tar.gz | |
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
libx264: Add support for the MPEG2 encoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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 c8545070f2..82db791b83 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -550,6 +550,7 @@ void avcodec_register_all(void) REGISTER_ENCODER(LIBWAVPACK, libwavpack); REGISTER_ENCODER(LIBWEBP_ANIM, libwebp_anim); /* preferred over libwebp */ REGISTER_ENCODER(LIBWEBP, libwebp); + REGISTER_ENCODER(LIBX262, libx262); REGISTER_ENCODER(LIBX264, libx264); REGISTER_ENCODER(LIBX264RGB, libx264rgb); REGISTER_ENCODER(LIBX265, libx265); |