[FFmpeg-devel] [PATCH 1/1] lavc: add support for OpenJPEG 2.3.0

[James Almer]

On 10/6/2017 1:26 PM, Michael Bradshaw wrote:
> On Thu, Oct 5, 2017 at 9:55 AM, James Almer <jamrial at gmail.com> wrote:
> 
>> On 10/5/2017 10:45 AM, Michael Bradshaw wrote:
>>> From: Michael Bradshaw <mjbshaw at google.com>
>>>
>>> Signed-off-by: Michael Bradshaw <mjbshaw at google.com>
>>> ---
>>>  configure                   |  5 ++++-
>>>  libavcodec/libopenjpegdec.c |  8 +++++---
>>>  libavcodec/libopenjpegenc.c | 10 ++++++----
>>>  3 files changed, 15 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/configure b/configure
>>> index 391c141e7a..77c9a18c3c 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -1930,6 +1930,7 @@ HEADERS_LIST="
>>>      machine_ioctl_meteor_h
>>>      malloc_h
>>>      opencv2_core_core_c_h
>>> +    openjpeg_2_3_openjpeg_h
>>
>> Is there a reason OpenJPEG uses a different folder to store the header
>> with each release from the 2.x family? It's really bloating both
>> configure and the wrappers.
> 
> 
> Yeah, it's really annoying. Once we drop support for 1.x versions we'll be
> able to clean up the majority of this garbage (though not all of it,
> unfortunately). I'd personally like to drop support for OpenJPEG 1.x
> immediately; the only place where it's still used is in package managers
> for LTS Linux distros, and I have no qualms about telling users to manually
> build/install a more recent version of OpenJPEG (especially since there are
> so many bug fixes in recent OpenJPEG versions, many of which are security
> related).

As Carl said, since we're a few days away from a new release it'll be
best to do it after it's branched off master. But for now, apply this
patch so the new release can use OpenJPEG 2.3

I see OpenJPEG2 ships a pkg-config file, which would let us drop all the
extra configure checks for each different include folder. That will
clear all the current configure bloat and prevent new checks to be added
in the future.