From 56a2df6b25bc93ea9a59b8e0bf8029f752f68573 Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 26 Apr 2018 16:46:31 -0500 Subject: [ffvpx] Restore AVOptions and dictionary features FFmpeg requires specific default values in AVCodecContext to be set. Instead of manually setting these each time we resync with upstream, let's use FFmpeg's own AVOptions which automatically sets all the values to their default. --- media/ffvpx/libavcodec/ff_options_table.h | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 media/ffvpx/libavcodec/ff_options_table.h (limited to 'media/ffvpx/libavcodec/ff_options_table.h') diff --git a/media/ffvpx/libavcodec/ff_options_table.h b/media/ffvpx/libavcodec/ff_options_table.h deleted file mode 100644 index ee01275d3..000000000 --- a/media/ffvpx/libavcodec/ff_options_table.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_OPTIONS_TABLE_H -#define AVCODEC_OPTIONS_TABLE_H - -#include "libavutil/opt.h" -static const AVOption avcodec_options[] = { -{NULL}, -}; - -#endif /* AVCODEC_OPTIONS_TABLE_H */ -- cgit v1.2.3