diff mbox

[FFmpeg-devel] Fix build with --enable-hardcoded-tables

Message ID CAB0OVGoRcrF+fkWiB_w4eKWbxwMYW4-9ji7WHZt-VkOD7rC4OQ@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos June 19, 2019, 11:43 a.m. UTC 
Hi!

Attached patch fixes ticket #7962 for me, please comment.

Thank you, Carl Eugen

Comments

Michael Niedermayer June 19, 2019, 6:54 p.m. UTC | #1 
On Wed, Jun 19, 2019 at 01:43:28PM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes ticket #7962 for me, please comment.
> 
> Thank you, Carl Eugen

>  tableprint_vlc.h |    1 +
>  1 file changed, 1 insertion(+)
> 9d5e5217e6a19d8e203da311a0cf108daf66129d  0001-lavc-tableprint_vlc-Remove-avpriv_request_sample-fro.patch
> From 2b82532897074d3f17c0a5f0a17da3a601d821d7 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Wed, 19 Jun 2019 13:41:01 +0200
> Subject: [PATCH] lavc/tableprint_vlc: Remove avpriv_request_sample() from
>  included files.
> 
> Fixes compilation with --enable-hardcoded-tables.
> Fixes ticket #7962.
> ---
>  libavcodec/tableprint_vlc.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
> index 3004be3f9c..b3ff36562b 100644
> --- a/libavcodec/tableprint_vlc.h
> +++ b/libavcodec/tableprint_vlc.h
> @@ -36,6 +36,7 @@
>  #define AVCODEC_AVCODEC_H
>  #define AVCODEC_INTERNAL_H
>  #define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this
> +#define avpriv_request_sample(...)
>  #include "tableprint.h"
>  #include "get_bits.h"
>  #include "mathtables.c"

should be ok if tested

thanks alot

[...]
Carl Eugen Hoyos June 23, 2019, 10:23 p.m. UTC | #2 
Am Mi., 19. Juni 2019 um 20:54 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Wed, Jun 19, 2019 at 01:43:28PM +0200, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch fixes ticket #7962 for me, please comment.
> >
> > Thank you, Carl Eugen
>
> >  tableprint_vlc.h |    1 +
> >  1 file changed, 1 insertion(+)
> > 9d5e5217e6a19d8e203da311a0cf108daf66129d  0001-lavc-tableprint_vlc-Remove-avpriv_request_sample-fro.patch
> > From 2b82532897074d3f17c0a5f0a17da3a601d821d7 Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Wed, 19 Jun 2019 13:41:01 +0200
> > Subject: [PATCH] lavc/tableprint_vlc: Remove avpriv_request_sample() from
> >  included files.
> >
> > Fixes compilation with --enable-hardcoded-tables.
> > Fixes ticket #7962.
> > ---
> >  libavcodec/tableprint_vlc.h | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
> > index 3004be3f9c..b3ff36562b 100644
> > --- a/libavcodec/tableprint_vlc.h
> > +++ b/libavcodec/tableprint_vlc.h
> > @@ -36,6 +36,7 @@
> >  #define AVCODEC_AVCODEC_H
> >  #define AVCODEC_INTERNAL_H
> >  #define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this
> > +#define avpriv_request_sample(...)
> >  #include "tableprint.h"
> >  #include "get_bits.h"
> >  #include "mathtables.c"
>
> should be ok if tested

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From 2b82532897074d3f17c0a5f0a17da3a601d821d7 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Wed, 19 Jun 2019 13:41:01 +0200
Subject: [PATCH] lavc/tableprint_vlc: Remove avpriv_request_sample() from
 included files.

Fixes compilation with --enable-hardcoded-tables.
Fixes ticket #7962.
---
 libavcodec/tableprint_vlc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
index 3004be3f9c..b3ff36562b 100644
--- a/libavcodec/tableprint_vlc.h
+++ b/libavcodec/tableprint_vlc.h
@@ -36,6 +36,7 @@ 
 #define AVCODEC_AVCODEC_H
 #define AVCODEC_INTERNAL_H
 #define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this
+#define avpriv_request_sample(...)
 #include "tableprint.h"
 #include "get_bits.h"
 #include "mathtables.c"
-- 
2.21.0