diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2014-03-07 04:55:48 +0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-07 17:32:55 +0400 |
| commit | d5254230068e196a2496618c0d89cdfbc41f7478 (patch) | |
| tree | 2b44535a12ff71b392aab21e1cd8a16ab5355d33 /libavcodec/Makefile | |
| parent | 4b476e6aa4b830f919cf3c67ba2caa039ff285b9 (diff) | |
Revert "Add libx265 encoder"
cf. the discussion following
https://lists.libav.org/pipermail/libav-devel/2014-March/056894.html
This reverts commit 50ea93158d4c480f64069e8bd1da388486dcf4ba.
Conflicts:
doc/general.texi
libavcodec/version.h
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7b50c27878..9e4dd25fd2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -616,7 +616,6 @@ OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o OBJS-$(CONFIG_LIBWAVPACK_ENCODER) += libwavpackenc.o OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o -OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o |