Commit 48884d48 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "Add Dirac encoding support to VLC using the Schroedinger library."

Hand-crafted code in plugin descriptor is not allowed. And the code was
unsurprisingly buggy.
This reverts commit 1c2a95b8.

Conflicts:

	modules/codec/schroedinger.c
parent 767026d4
...@@ -45,8 +45,6 @@ Codecs: ...@@ -45,8 +45,6 @@ Codecs:
* You can now use ffmpeg-mt in conjunction with vlc * You can now use ffmpeg-mt in conjunction with vlc
* Important fixes for RealVideo 3.0 and 4.0 playback, notably in MKV * Important fixes for RealVideo 3.0 and 4.0 playback, notably in MKV
* Experimental Hardware decoding using Broadcom CrystalHD cards * Experimental Hardware decoding using Broadcom CrystalHD cards
* New module for Dirac encoding, using the faster libschroedinger
The Schroedinger module should be prefered to the Dirac one
* New module for decoding EBU subtitles (.stl) * New module for decoding EBU subtitles (.stl)
Demuxers: Demuxers:
......
...@@ -2942,7 +2942,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) ...@@ -2942,7 +2942,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto])
dnl dnl
dnl schroedinger decoder plugin (for dirac format video) dnl schroedinger decoder plugin (for dirac format video)
dnl dnl
PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto]) PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto])
dnl dnl
dnl PNG decoder module dnl PNG decoder module
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment