vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Wed Aug 8 16:54:12 2018 +0200| [b226ed81b0eda9239261f396c3e7220b20343ad4] | committer: Hugo Beauzée-Luyssen
codec: aom: do proper color mapping (cherry picked from commit c4e5806a0e12dfb099abe865facb5bc7c10e30e5) Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b226ed81b0eda9239261f396c3e7220b20343ad4 --- modules/codec/Makefile.am | 2 +- modules/codec/aom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 9bbc5f2877..86fa4f9e3e 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -573,7 +573,7 @@ EXTRA_LTLIBRARIES += libvpx_plugin.la codec_LTLIBRARIES += $(LTLIBvpx) libaom_plugin_la_SOURCES = codec/aom.c \ - demux/mp4/color_config.h + packetizer/iso_color_tables.h libaom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libaom_plugin_la_CFLAGS = $(AM_CFLAGS) $(AOM_CFLAGS) $(CPPFLAGS_aom) libaom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' diff --git a/modules/codec/aom.c b/modules/codec/aom.c index 4efe39f12b..86dd7d1d77 100644 --- a/modules/codec/aom.c +++ b/modules/codec/aom.c @@ -35,7 +35,7 @@ #include <aom/aom_decoder.h> #include <aom/aomdx.h> -#include "demux/mp4/color_config.h" +#include "../packetizer/iso_color_tables.h" /**************************************************************************** * Local prototypes _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
