Merge mozilla-central to mozilla-inbound

.taskcluster.yml

@@ -36,7 +36,7 @@ tasks:
     task:
       created: '{{now}}'
       deadline: '{{#from_now}}1 day{{/from_now}}'
-      expires: '{{#from_now}}14 day{{/from_now}}'
+      expires: '{{#from_now}}365 day{{/from_now}}'
       metadata:
         owner: mozilla-taskcluster-maintenance@mozilla.com
         source: {{{source}}}
@@ -70,41 +70,51 @@ tasks:
           GECKO_HEAD_REPOSITORY: '{{{url}}}'
           GECKO_HEAD_REF: '{{revision}}'
           GECKO_HEAD_REV: '{{revision}}'
-          # Arguments passed into `mach taskgraph decision`
-          # TODO use mozilla-unified for the base repository once the tc-vcs
-          # tar.gz archives are created or tc-vcs isn't being used.
-          DECISION_ARGS: >
-            --pushlog-id='{{pushlog_id}}'
-            --project='{{project}}'
-            --message='{{comment}}'
-            --owner='{{owner}}'
-            --level='{{level}}'
-            --base-repository='https://hg.mozilla.org/mozilla-central'
-            --head-repository='{{{url}}}'
-            --head-ref='{{revision}}'
-            --head-rev='{{revision}}'
-            --revision-hash='{{revision_hash}}'
 
         cache:
           level-{{level}}-hg-shared: /home/worker/hg-shared
-          level-{{level}}-gecko-decision: /home/worker/workspace
+          level-{{level}}-checkouts: /home/worker/checkouts
 
         features:
           taskclusterProxy: true
 
         # Note: This task is built server side without the context or tooling that
         # exist in tree so we must hard code the version
-        image: 'taskcluster/decision:0.1.2'
+        image: 'taskcluster/decision:0.1.3'
 
         maxRunTime: 1800
 
+        # TODO use mozilla-unified for the base repository once the tc-vcs
+        # tar.gz archives are created or tc-vcs isn't being used.
         command:
-          - /home/worker/bin/run-decision
+          - /home/worker/bin/run-task
+          - '--vcs-checkout=/home/worker/checkouts/gecko'
+          - '--'
+          - bash
+          - -cx
+          - >
+              cd /home/worker/checkouts/gecko &&
+              ln -s /home/worker/artifacts artifacts &&
+              ./mach --log-no-times taskgraph decision
+              --pushlog-id='{{pushlog_id}}'
+              --project='{{project}}'
+              --message='{{comment}}'
+              --owner='{{owner}}'
+              --level='{{level}}'
+              --base-repository='https://hg.mozilla.org/mozilla-central'
+              --head-repository='{{{url}}}'
+              --head-ref='{{revision}}'
+              --head-rev='{{revision}}'
+              --revision-hash='{{revision_hash}}'
 
         artifacts:
           'public':
             type: 'directory'
             path: '/home/worker/artifacts'
+            expires: '{{#from_now}}364 days{{/from_now}}'
+          'public/docker_image_contexts':
+            type: 'directory'
+            path: '/home/worker/docker_image_contexts'
             expires: '{{#from_now}}7 days{{/from_now}}'
 
       extra:

browser/components/extensions/test/browser/browser_ext_optionsPage_privileges.js

@@ -30,7 +30,7 @@ add_task(function* test_tab_options_privileges() {
   }
 
   let extension = ExtensionTestUtils.loadExtension({
-    useAddonManager: true,
+    useAddonManager: "temporary",
 
     manifest: {
       "permissions": ["tabs"],

browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js

@@ -4,7 +4,7 @@
 
 function* loadExtension(options) {
   let extension = ExtensionTestUtils.loadExtension({
-    useAddonManager: true,
+    useAddonManager: "temporary",
 
     manifest: Object.assign({
       "permissions": ["tabs"],

browser/config/mozconfigs/linux32/release

@@ -3,7 +3,7 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
 if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 

browser/config/mozconfigs/linux64/release

@@ -3,7 +3,7 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
 if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 

devtools/client/shared/components/frame.js

@@ -5,7 +5,8 @@
 "use strict";
 
 const { DOM: dom, createClass, PropTypes } = require("devtools/client/shared/vendor/react");
-const { getSourceNames, parseURL, isScratchpadScheme } = require("devtools/client/shared/source-utils");
+const { getSourceNames, parseURL,
+        isScratchpadScheme, getSourceMappedFile } = require("devtools/client/shared/source-utils");
 const { LocalizationHelper } = require("devtools/client/shared/l10n");
 
 const l10n = new LocalizationHelper("chrome://devtools/locale/components.properties");
@@ -181,15 +182,8 @@ module.exports = createClass({
     }
 
     let displaySource = showFullSourceUrl ? long : short;
-    // SourceMapped locations might not be parsed properly by parseURL.
-    // Eg: sourcemapped location could be /folder/file.coffee instead of a url
-    // and so the url parser would not parse non-url locations properly
-    // Check for "/" in displaySource. If "/" is in displaySource,
-    // take everything after last "/".
     if (isSourceMapped) {
-      displaySource = displaySource.lastIndexOf("/") < 0 ?
-        displaySource :
-        displaySource.slice(displaySource.lastIndexOf("/") + 1);
+      displaySource = getSourceMappedFile(displaySource);
     } else if (showEmptyPathAsHost && (displaySource === "" || displaySource === "/")) {
       displaySource = host;
     }

devtools/client/shared/source-utils.js

@@ -299,9 +299,30 @@ function isChromeScheme(location, i = 0) {
   }
 }
 
+/**
+ * A utility method to get the file name from a sourcemapped location
+ * The sourcemap location can be in any form. This method returns a
+ * formatted file name for different cases like Windows or OSX.
+ * @param source
+ * @returns String
+ */
+function getSourceMappedFile(source) {
+  // If sourcemapped source is a OSX path, return
+  // the characters after last "/".
+  // If sourcemapped source is a Windowss path, return
+  // the characters after last "\\".
+  if (source.lastIndexOf("/") >= 0) {
+    source = source.slice(source.lastIndexOf("/") + 1);
+  } else if (source.lastIndexOf("\\") >= 0) {
+    source = source.slice(source.lastIndexOf("\\") + 1);
+  }
+  return source;
+}
+
 exports.parseURL = parseURL;
 exports.getSourceNames = getSourceNames;
 exports.isScratchpadScheme = isScratchpadScheme;
 exports.isChromeScheme = isChromeScheme;
 exports.isContentScheme = isContentScheme;
 exports.isDataScheme = isDataScheme;
+exports.getSourceMappedFile = getSourceMappedFile;

devtools/client/shared/test/unit/test_source-utils.js

@@ -152,6 +152,22 @@ add_task(function* () {
                    "example.com");
 });
 
+// Test for source mapped file name
+add_task(function* () {
+  const { getSourceMappedFile } = sourceUtils;
+  const source = "baz.js";
+  const output = getSourceMappedFile(source);
+  equal(output, "baz.js", "correctly formats file name");
+  // Test for OSX file path
+  const source1 = "/foo/bar/baz.js";
+  const output1 = getSourceMappedFile(source1);
+  equal(output1, "baz.js", "correctly formats Linux file path");
+  // Test for Windows file path
+  const source2 = "Z:\\foo\\bar\\baz.js";
+  const output2 = getSourceMappedFile(source2);
+  equal(output2, "baz.js", "correctly formats Windows file path");
+});
+
 function testAbbreviation(source, short, long, host) {
   let results = sourceUtils.getSourceNames(source);
   equal(results.short, short, `${source} has correct "short" name`);

devtools/client/themes/toolbars.css

@@ -248,6 +248,7 @@
 
 .devtools-button[checked]:empty::before,
 .devtools-button[open]:empty::before,
+.devtools-button.checked::before,
 .devtools-toolbarbutton:not([label])[checked=true] > image,
 .devtools-toolbarbutton:not([label])[open=true] > image {
   filter: var(--checked-icon-filter);
@@ -308,6 +309,10 @@
   background-image: var(--clear-icon-url);
 }
 
+.devtools-button.devtools-filter-icon::before {
+  background-image: var(--filter-image);
+}
+
 .devtools-toolbarbutton.devtools-clear-icon {
   list-style-image: var(--clear-icon-url);
 }
@@ -384,6 +389,15 @@
   font-style: normal;
 }
 
+.devtools-plaininput {
+  border-color: transparent;
+  background-color: transparent;
+}
+
+.theme-dark .devtools-plaininput {
+  color: var(--theme-highlight-gray);
+}
+
 /* Searchbox is a div container element for a search input element */
 .devtools-searchbox {
   display: flex;
@@ -649,3 +663,31 @@
     transform: rotate(360deg);
   }
 }
+
+/*
+ * Filter buttons
+ * @TODO : Fix when https://bugzilla.mozilla.org/show_bug.cgi?id=1255116 lands
+ */
+.menu-filter-button {
+  -moz-appearance: none;
+  background: rgba(128,128,128,0.1);
+  border: none;
+  border-radius: 2px;
+  min-width: 0;
+  padding: 0 5px;
+  margin: 2px;
+  color: var(--theme-body-color);
+}
+
+.menu-filter-button:hover {
+  background: rgba(128,128,128,0.2);
+}
+
+.menu-filter-button:hover:active {
+  background-color: var(--theme-selection-background-semitransparent);
+}
+
+.menu-filter-button:not(:active).checked {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
+}

devtools/client/themes/webconsole.css

@@ -151,6 +151,7 @@ a {
   direction: ltr;
   overflow: auto;
   -moz-user-select: text;
+  position: relative;
 }
 
 /* The width on #output-container is set to a hardcoded px in webconsole.js
@@ -624,3 +625,41 @@ a.learn-more-link.webconsole-learn-more-link {
   border-left: 1px solid #D7D7D7;
   border-right: 1px solid #D7D7D7;
 }
+
+
+/* NEW CONSOLE STYLES */
+
+#output-wrapper > div {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+#output-container {
+  height: 100%;
+}
+
+.webconsole-output-wrapper {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.webconsole-filterbar-wrapper {
+  flex-grow: 0;
+}
+
+.webconsole-output {
+  flex: 1;
+  overflow: auto;
+}
+
+.webconsole-filterbar-primary {
+  display: flex;
+}
+
+.webconsole-filterbar-primary .devtools-plaininput {
+  flex: 1 1 100%;
+}

devtools/client/webconsole/new-console-output/actions/messages.js

@@ -13,6 +13,9 @@ const {
 const {
   MESSAGE_ADD,
   MESSAGES_CLEAR,
+  SEVERITY_FILTER,
+  MESSAGES_SEARCH,
+  FILTERS_CLEAR,
 } = require("../constants");
 
 function messageAdd(packet) {
@@ -29,5 +32,29 @@ function messagesClear() {
   };
 }
 
+function severityFilter(filter, toggled) {
+  return {
+    type: SEVERITY_FILTER,
+    filter,
+    toggled
+  };
+}
+
+function filtersClear() {
+  return {
+    type: FILTERS_CLEAR
+  };
+}
+
+function messagesSearch(searchText) {
+  return {
+    type: MESSAGES_SEARCH,
+    searchText
+  };
+}
+
 exports.messageAdd = messageAdd;
 exports.messagesClear = messagesClear;
+exports.severityFilter = severityFilter;
+exports.filtersClear = filtersClear;
+exports.messagesSearch = messagesSearch;

devtools/client/webconsole/new-console-output/actions/moz.build

@@ -5,4 +5,5 @@
 
 DevToolsModules(
     'messages.js',
+    'ui.js',
 )

devtools/client/webconsole/new-console-output/actions/ui.js

@@ -0,0 +1,19 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  FILTERBAR_TOGGLE,
+} = require("../constants");
+
+function filterBarToggle(show) {
+  return {
+    type: FILTERBAR_TOGGLE
+  };
+}
+
+exports.filterBarToggle = filterBarToggle;

devtools/client/webconsole/new-console-output/components/console-output.js

@@ -27,8 +27,7 @@ const ConsoleOutput = createClass({
   displayName: "ConsoleOutput",
 
   componentWillUpdate() {
-    // @TODO Move this to a parent component.
-    let node = ReactDOM.findDOMNode(this).parentNode.parentNode.parentNode;
+    let node = ReactDOM.findDOMNode(this);
     if (node.lastChild) {
       this.shouldScrollBottom = isScrolledToBottom(node.lastChild, node);
     }
@@ -36,7 +35,7 @@ const ConsoleOutput = createClass({
 
   componentDidUpdate() {
     if (this.shouldScrollBottom) {
-      let node = ReactDOM.findDOMNode(this).parentNode.parentNode.parentNode;
+      let node = ReactDOM.findDOMNode(this);
       node.scrollTop = node.scrollHeight;
     }
   },
@@ -48,7 +47,7 @@ const ConsoleOutput = createClass({
       );
     });
     return (
-      dom.div({}, messageNodes)
+      dom.div({className: "webconsole-output"}, messageNodes)
     );
   }
 });

devtools/client/webconsole/new-console-output/components/filter-bar.js

@@ -0,0 +1,133 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const {
+  createFactory,
+  createClass,
+  DOM: dom,
+  PropTypes
+} = require("devtools/client/shared/vendor/react");
+const { connect } = require("devtools/client/shared/vendor/react-redux");
+const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
+const messagesActions = require("devtools/client/webconsole/new-console-output/actions/messages");
+const uiActions = require("devtools/client/webconsole/new-console-output/actions/ui");
+const { store } = require("devtools/client/webconsole/new-console-output/store");
+const {
+  SEVERITY_FILTER
+} = require("../constants");
+const FilterToggleButton = createFactory(require("devtools/client/webconsole/new-console-output/components/filter-toggle-button").FilterToggleButton);
+
+const FilterBar = createClass({
+
+  displayName: "FilterBar",
+
+  propTypes: {
+    filter: PropTypes.object.isRequired,
+    ui: PropTypes.object.isRequired
+  },
+
+  onClearOutputButtonClick: function () {
+    store.dispatch(messagesActions.messagesClear());
+  },
+
+  onToggleFilterConfigBarButtonClick: function () {
+    store.dispatch(uiActions.filterBarToggle());
+  },
+
+  onClearFiltersButtonClick: function () {
+    store.dispatch(messagesActions.filtersClear());
+  },
+
+  onSearchInput: function (e) {
+    store.dispatch(messagesActions.messagesSearch(e.target.value));
+  },
+
+  render() {
+    const {filter, ui} = this.props;
+    let configFilterBarVisible = ui.configFilterBarVisible;
+    let children = [];
+
+    children.push(dom.div({className: "devtools-toolbar webconsole-filterbar-primary"},
+      dom.button({
+        className: "devtools-button devtools-clear-icon",
+        title: "Clear output",
+        onClick: this.onClearOutputButtonClick
+      }),
+      dom.button({
+        className: "devtools-button devtools-filter-icon" + (
+          configFilterBarVisible ? " checked" : ""),
+        title: "Toggle filter bar",
+        onClick: this.onToggleFilterConfigBarButtonClick
+      }),
+      dom.input({
+        className: "devtools-plaininput",
+        type: "search",
+        value: filter.searchText,
+        placeholder: "Filter output",
+        onInput: this.onSearchInput
+      })
+    ));
+
+    if (configFilterBarVisible) {
+      children.push(
+        dom.div({className: "devtools-toolbar"},
+          FilterToggleButton({
+            active: filter.error,
+            label: "Errors",
+            filterType: SEVERITY_FILTER,
+            filterKey: "error"}),
+          FilterToggleButton({
+            active: filter.warn,
+            label: "Warnings",
+            filterType: SEVERITY_FILTER,
+            filterKey: "warn"}),
+          FilterToggleButton({
+            active: filter.log,
+            label: "Logs",
+            filterType: SEVERITY_FILTER,
+            filterKey: "log"}),
+          FilterToggleButton({
+            active: filter.info,
+            label: "Info",
+            filterType: SEVERITY_FILTER,
+            filterKey: "info"})
+        )
+      );
+    }
+
+    if (ui.filteredMessageVisible) {
+      children.push(
+        dom.div({className: "devtools-toolbar"},
+          dom.span({
+            className: "clear"},
+            "You have filters set that may hide some results. " +
+            "Learn more about our filtering syntax ",
+            dom.a({}, "here"),
+            "."),
+          dom.button({
+            className: "menu-filter-button",
+            onClick: this.onClearFiltersButtonClick
+          }, "Remove filters")
+        )
+      );
+    }
+
+    return (
+      dom.div({className: "webconsole-filteringbar-wrapper"},
+        children
+      )
+    );
+  }
+});
+
+function mapStateToProps(state) {
+  return {
+    filter: getAllFilters(state),
+    ui: getAllUi(state)
+  };
+}
+
+module.exports = connect(mapStateToProps)(FilterBar);

devtools/client/webconsole/new-console-output/components/filter-toggle-button.js

@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const {
+  createClass,
+  DOM: dom,
+  PropTypes
+} = require("devtools/client/shared/vendor/react");
+const { store } = require("devtools/client/webconsole/new-console-output/store");
+const actions = require("devtools/client/webconsole/new-console-output/actions/messages");
+const {
+  SEVERITY_FILTER
+} = require("../constants");
+
+const FilterToggleButton = createClass({
+
+  displayName: "FilterToggleButton",
+
+  propTypes: {
+    label: PropTypes.string.isRequired,
+    filterType: PropTypes.string.isRequired,
+    filterKey: PropTypes.string.isRequired,
+    active: PropTypes.bool.isRequired,
+  },
+
+  onClick: function () {
+    if (this.props.filterType === SEVERITY_FILTER) {
+      store.dispatch(actions.severityFilter(
+        this.props.filterKey, !this.props.active));
+    }
+  },
+
+  render() {
+    const {label, active} = this.props;
+
+    let classList = ["menu-filter-button"];
+    if (active) {
+      classList.push("checked");
+    }
+
+    return dom.button({
+      className: classList.join(" "),
+      onClick: this.onClick
+    }, label);
+  }
+});
+
+exports.FilterToggleButton = FilterToggleButton;

devtools/client/webconsole/new-console-output/components/message-container.js

@@ -33,6 +33,10 @@ const MessageContainer = createClass({
     message: PropTypes.object.isRequired
   },
 
+  shouldComponentUpdate(nextProps, nextState) {
+    return this.props.message.repeat !== nextProps.message.repeat;
+  },
+
   render() {
     const { message } = this.props;
     let MessageComponent = createFactory(getMessageComponent(message));

devtools/client/webconsole/new-console-output/components/moz.build

@@ -9,6 +9,8 @@ DIRS += [
 
 DevToolsModules(
     'console-output.js',
+    'filter-bar.js',
+    'filter-toggle-button.js',
     'grip-message-body.js',
     'message-container.js',
     'message-icon.js',

devtools/client/webconsole/new-console-output/constants.js

@@ -8,6 +8,10 @@
 const actionTypes = {
   MESSAGE_ADD: "MESSAGE_ADD",
   MESSAGES_CLEAR: "MESSAGES_CLEAR",
+  SEVERITY_FILTER: "SEVERITY_FILTER",
+  MESSAGES_SEARCH: "MESSAGES_SEARCH",
+  FILTERS_CLEAR: "FILTERS_CLEAR",
+  FILTERBAR_TOGGLE: "FILTERBAR_TOGGLE",
 };
 
 const categories = {
@@ -92,6 +96,10 @@ const chromeRDPEnums = {
   }
 };
 
+const filterTypes = {
+  SEVERITY_FILTER: "SEVERITY_FILTER"
+};
+
 // Combine into a single constants object
 module.exports = Object.assign({}, actionTypes, categories, severities, levels,
-  chromeRDPEnums);
+  chromeRDPEnums, filterTypes);

devtools/client/webconsole/new-console-output/new-console-output-wrapper.js

@@ -12,11 +12,19 @@ const actions = require("devtools/client/webconsole/new-console-output/actions/m
 const { store } = require("devtools/client/webconsole/new-console-output/store");
 
 const ConsoleOutput = React.createFactory(require("devtools/client/webconsole/new-console-output/components/console-output"));
+const FilterBar = React.createFactory(require("devtools/client/webconsole/new-console-output/components/filter-bar"));
 
 function NewConsoleOutputWrapper(parentNode, jsterm) {
   let childComponent = ConsoleOutput({ jsterm });
+  let filterBar = FilterBar({});
   let provider = React.createElement(
-    Provider, { store: store }, childComponent);
+    Provider,
+    { store: store },
+    React.DOM.div(
+      {className: "webconsole-output-wrapper"},
+      filterBar,
+      childComponent
+  ));
   this.body = ReactDOM.render(provider, parentNode);
 }
 

devtools/client/webconsole/new-console-output/reducers/filters.js

@@ -0,0 +1,35 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const Immutable = require("devtools/client/shared/vendor/immutable");
+const constants = require("devtools/client/webconsole/new-console-output/constants");
+
+const FilterState = Immutable.Record({
+  error: true,
+  warn: true,
+  info: true,
+  log: true,
+  searchText: ""
+});
+
+function filters(state = new FilterState(), action) {
+  switch (action.type) {
+    case constants.SEVERITY_FILTER:
+      let {filter, toggled} = action;
+      return state.set(filter, toggled);
+    case constants.FILTERS_CLEAR:
+      return new FilterState();
+    case constants.MESSAGES_SEARCH:
+      let {searchText} = action;
+      return state.set("searchText", searchText);
+  }
+
+  return state;
+}
+
+exports.FilterState = FilterState;
+exports.filters = filters;

devtools/client/webconsole/new-console-output/reducers/index.js

@@ -5,10 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const { filters } = require("./filters");
 const { messages } = require("./messages");
 const { prefs } = require("./prefs");
+const { ui } = require("./ui");
 
 exports.reducers = {
+  filters,
   messages,
   prefs,
+  ui,
 };

devtools/client/webconsole/new-console-output/reducers/moz.build

@@ -4,7 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'filters.js',
     'index.js',
     'messages.js',
     'prefs.js',
+    'ui.js',
 )

devtools/client/webconsole/new-console-output/reducers/prefs.js

@@ -5,8 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-function prefs(state = {}, action) {
+const Immutable = require("devtools/client/shared/vendor/immutable");
+const PrefState = Immutable.Record({
+  logLimit: 1000
+});
+
+function prefs(state = new PrefState(), action) {
   return state;
 }
 
+exports.PrefState = PrefState;
 exports.prefs = prefs;

devtools/client/webconsole/new-console-output/reducers/ui.js

@@ -0,0 +1,25 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const constants = require("devtools/client/webconsole/new-console-output/constants");
+const Immutable = require("devtools/client/shared/vendor/immutable");
+
+const Ui = Immutable.Record({
+  configFilterBarVisible: false,
+  filteredMessageVisible: false
+});
+
+function ui(state = new Ui(), action) {
+  switch (action.type) {
+    case constants.FILTERBAR_TOGGLE:
+      return state.set("configFilterBarVisible", !state.configFilterBarVisible);
+  }
+
+  return state;
+}
+
+exports.ui = ui;

devtools/client/webconsole/new-console-output/selectors/filters.js

@@ -0,0 +1,12 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+function getAllFilters(state) {
+  return state.filters;
+}
+
+exports.getAllFilters = getAllFilters;

devtools/client/webconsole/new-console-output/selectors/messages.js

@@ -5,13 +5,46 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
 const { getLogLimit } = require("devtools/client/webconsole/new-console-output/selectors/prefs");
 
 function getAllMessages(state) {
   let messages = state.messages;
-  let messageCount = messages.count();
   let logLimit = getLogLimit(state);
+  let filters = getAllFilters(state);
 
+  return prune(
+    search(
+      filterSeverity(messages, filters),
+      filters.searchText
+    ),
+    logLimit
+  );
+}
+
+function filterSeverity(messages, filters) {
+  return messages.filter((message) => filters[message.severity] === true);
+}
+
+function search(messages, searchText = "") {
+  if (searchText === "") {
+    return messages;
+  }
+
+  return messages.filter(function (message) {
+    // @TODO: message.parameters can be a grip, see how we can handle that
+    if (!Array.isArray(message.parameters)) {
+      return true;
+    }
+    return message
+      .parameters.join("")
+      .toLocaleLowerCase()
+      .includes(searchText.toLocaleLowerCase());
+  });
+}
+
+function prune(messages, logLimit) {
+  let messageCount = messages.count();
   if (messageCount > logLimit) {
     return messages.splice(0, messageCount - logLimit);
   }

devtools/client/webconsole/new-console-output/selectors/moz.build

@@ -4,6 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'filters.js',
     'messages.js',
     'prefs.js',
+    'ui.js',
 )

devtools/client/webconsole/new-console-output/selectors/ui.js

@@ -0,0 +1,12 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+function getAllUi(state) {
+  return state.ui;
+}
+
+exports.getAllUi = getAllUi;

devtools/client/webconsole/new-console-output/store.js

@@ -3,17 +3,24 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { combineReducers, createStore } = require("devtools/client/shared/vendor/redux");
-const Immutable = require("devtools/client/shared/vendor/immutable");
-const { reducers } = require("./reducers/index");
 const Services = require("Services");
+const {FilterState} = require("devtools/client/webconsole/new-console-output/reducers/filters");
+const {PrefState} = require("devtools/client/webconsole/new-console-output/reducers/prefs");
+const { combineReducers, createStore } = require("devtools/client/shared/vendor/redux");
+const { reducers } = require("./reducers/index");
 
 function storeFactory() {
   const initialState = {
-    messages: Immutable.List(),
-    prefs: {
-      logLimit: Math.max(Services.prefs.getIntPref("devtools.hud.loglimit"), 1)
-    }
+    prefs: new PrefState({
+      logLimit: Math.max(Services.prefs.getIntPref("devtools.hud.loglimit"), 1),
+    }),
+    filters: new FilterState({
+      error: Services.prefs.getBoolPref("devtools.webconsole.filter.error"),
+      warn: Services.prefs.getBoolPref("devtools.webconsole.filter.warn"),
+      info: Services.prefs.getBoolPref("devtools.webconsole.filter.info"),
+      log: Services.prefs.getBoolPref("devtools.webconsole.filter.log"),
+      searchText: ""
+    })
   };
 
   return createStore(combineReducers(reducers), initialState);

devtools/client/webconsole/new-console-output/test/components/test_console-api-call.html

@@ -44,8 +44,16 @@ function testConsoleCount() {
 
     const expected = `bar: ${i + 1}`;
     is(messageBody.textContent, expected,
-      "console.count has the expected text content: ${expected}");
+      `console.count has the expected text content: "${expected}"`);
   }
+
+  const packet = yield getPacket("console.count()", "consoleAPICall")
+  const message = prepareMessage(packet);
+  const rendered = renderComponent(ConsoleApiCall, {message: message});
+  const messageBody = getMessageBody(rendered);
+  const expected = "<no label>: 1";
+  is(messageBody.textContent, expected,
+    `console.count without label has the expected text content: "${expected}"`);
 }
 
 function getMessageBody(renderedComponent) {

devtools/client/webconsole/new-console-output/test/utils/chrome.ini

@@ -4,3 +4,5 @@ support-files =
   ../components/head.js
 
 [test_getRepeatId.html]
+[test_render_perf.html]
+skip-if = debug

devtools/client/webconsole/new-console-output/test/utils/test_render_perf.html

@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+  <meta charset="utf8">
+  <title>Test for getRepeatId()</title>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.8" src="head.js"></script>
+  <!-- Any copyright is dedicated to the Public Domain.
+     - http://creativecommons.org/publicdomain/zero/1.0/ -->
+</head>
+<body>
+<p>Test for render perf</p>
+<div id="output"></div>
+
+<script type="text/javascript;version=1.8">
+const testPackets = [];
+const numMessages = 1000;
+for (let id = 0; id < numMessages; id++) {
+  testPackets.push({
+    "from": "server1.conn4.child1/consoleActor2",
+    "type": "consoleAPICall",
+    "message": {
+      "arguments": [
+        "foobar",
+        "test",
+        id
+      ],
+      "columnNumber": 1,
+      "counter": null,
+      "filename": "file:///test.html",
+      "functionName": "",
+      "groupName": "",
+      "level": "log",
+      "lineNumber": 1,
+      "private": false,
+      "styles": [],
+      "timeStamp": 1455064271115 + id,
+      "timer": null,
+      "workerType": "none",
+      "category": "webdev"
+    }
+  });
+}
+window.onload = Task.async(function* () {
+  const NewConsoleOutputWrapper = browserRequire("devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+  const wrapper = new NewConsoleOutputWrapper(document.querySelector("#output"), {});
+  let start = performance.now();
+  testPackets.forEach((message) => {
+    wrapper.dispatchMessageAdd(message);
+  });
+  let elapsed = performance.now() - start;
+  info("took " + elapsed / 1000 + " seconds");
+  ok(true, "Yay, it didn't time out!");
+
+  SimpleTest.finish();
+});
+</script>
+</body>
+</html>

devtools/client/webconsole/new-console-output/utils/messages.js

@@ -58,7 +58,9 @@ function transformPacket(packet) {
           // Chrome RDP doesn't have a special type for count.
           type = MESSAGE_TYPE.LOG;
           level = MESSAGE_LEVEL.DEBUG;
-          messageText = `${message.counter.label}: ${message.counter.count}`;
+          let {counter} = message;
+          let label = counter.label ? counter.label : l10n.getStr("noCounterLabel");
+          messageText = `${label}: ${counter.count}`;
           parameters = null;
           break;
       }

devtools/client/webconsole/webconsole.js

@@ -553,6 +553,9 @@ WebConsoleFrame.prototype = {
       // in JSTerm is still necessary.
       this.newConsoleOutput = new this.window.NewConsoleOutput(this.experimentalOutputNode, this.jsterm);
       console.log("Created newConsoleOutput", this.newConsoleOutput);
+
+      let filterToolbar = doc.querySelector(".hud-console-filter-toolbar");
+      filterToolbar.hidden = true;
     }
 
     this.resize();
@@ -586,6 +589,13 @@ WebConsoleFrame.prototype = {
         return;
       }
 
+      // Do not focus if a search input was clicked on the new frontend
+      if (this.NEW_CONSOLE_OUTPUT_ENABLED &&
+          event.target.nodeName.toLowerCase() === "input" &&
+          event.target.getAttribute("type").toLowerCase() === "search") {
+        return;
+      }
+
       this.jsterm.focus();
     });
 

dom/media/MediaDecoder.cpp

@@ -292,10 +292,7 @@ void
 MediaDecoder::NotifyOwnerActivityChanged(bool aIsVisible)
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (IsShutdown()) {
-    return;
-  }
+  MOZ_ASSERT(!IsShutdown());
 
   SetElementVisibility(aIsVisible);
 
@@ -322,9 +319,9 @@ void
 MediaDecoder::UpdateDormantState(bool aDormantTimeout, bool aActivity)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!IsShutdown());
 
-  if (IsShutdown() ||
-      !mDecoderStateMachine ||
+  if (!mDecoderStateMachine ||
       !mOwner->GetVideoFrameContainer() ||
       (mOwner->GetMediaElement() && mOwner->GetMediaElement()->IsBeingDestroyed()) ||
       !mDormantSupported)
@@ -389,16 +386,11 @@ void
 MediaDecoder::StartDormantTimer()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (!IsHeuristicDormantSupported()) {
-    return;
-  }
 
-  if (mIsHeuristicDormant ||
-      IsShutdown() ||
+  if (!IsHeuristicDormantSupported() ||
+      mIsHeuristicDormant ||
       mIsVisible ||
-      (mPlayState != PLAY_STATE_PAUSED &&
-       !IsEnded()))
-  {
+      (mPlayState != PLAY_STATE_PAUSED && !IsEnded())) {
     return;
   }
 
@@ -424,9 +416,7 @@ void
 MediaDecoder::Pause()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (IsShutdown()) {
-    return;
-  }
+  MOZ_ASSERT(!IsShutdown());
   if (mPlayState == PLAY_STATE_LOADING || IsEnded()) {
     mNextState = PLAY_STATE_PAUSED;
     return;
@@ -619,6 +609,8 @@ MediaDecoder::Shutdown()
   mCDMProxyPromiseHolder.RejectIfExists(true, __func__);
 #endif
 
+  DiscardOngoingSeekIfExists();
+
   // This changes the decoder state to SHUTDOWN and does other things
   // necessary to unblock the state machine thread if it's blocked, so
   // the asynchronous shutdown in nsDestroyStateMachine won't deadlock.
@@ -804,7 +796,7 @@ nsresult
 MediaDecoder::Seek(double aTime, SeekTarget::Type aSeekType, dom::Promise* aPromise /*=nullptr*/)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  NS_ENSURE_TRUE(!IsShutdown(), NS_ERROR_FAILURE);
+  MOZ_ASSERT(!IsShutdown());
 
   UpdateDormantState(false /* aDormantTimeout */, true /* aActivity */);
 
@@ -1675,9 +1667,7 @@ void
 MediaDecoder::FireTimeUpdate()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (IsShutdown()) {
-    return;
-  }
+  MOZ_ASSERT(!IsShutdown());
   mOwner->FireTimeUpdate(true);
 }
 
@@ -1862,8 +1852,9 @@ void
 MediaDecoder::ConstructMediaTracks()
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!IsShutdown());
 
-  if (IsShutdown() || mMediaTracksConstructed || !mInfo) {
+  if (mMediaTracksConstructed || !mInfo) {
     return;
   }
 
@@ -1898,10 +1889,7 @@ void
 MediaDecoder::RemoveMediaTracks()
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (IsShutdown()) {
-    return;
-  }
+  MOZ_ASSERT(!IsShutdown());
 
   HTMLMediaElement* element = mOwner->GetMediaElement();
   if (!element) {
@@ -1939,17 +1927,18 @@ MediaDecoder::NextFrameBufferedStatus()
 void
 MediaDecoder::DumpDebugInfo()
 {
+  MOZ_ASSERT(!IsShutdown());
   DUMP_LOG("metadata: channels=%u rate=%u hasAudio=%d hasVideo=%d, "
-           "state: mPlayState=%s mIsDormant=%d, IsShutdown()=%d",
+           "state: mPlayState=%s mIsDormant=%d",
            mInfo ? mInfo->mAudio.mChannels : 0, mInfo ? mInfo->mAudio.mRate : 0,
            mInfo ? mInfo->HasAudio() : 0, mInfo ? mInfo->HasVideo() : 0,
-           PlayStateStr(), mIsDormant, IsShutdown());
+           PlayStateStr(), mIsDormant);
 
   nsString str;
   GetMozDebugReaderData(str);
   DUMP_LOG("reader data:\n%s", NS_ConvertUTF16toUTF8(str).get());
 
-  if (!IsShutdown() && GetStateMachine()) {
+  if (GetStateMachine()) {
     GetStateMachine()->DumpDebugInfo();
   }
 }

dom/media/MediaDecoder.h

@@ -491,9 +491,8 @@ private:
   void UpdateReadyState()
   {
     MOZ_ASSERT(NS_IsMainThread());
-    if (!IsShutdown()) {
-      mOwner->UpdateReadyState();
-    }
+    MOZ_ASSERT(!IsShutdown());
+    mOwner->UpdateReadyState();
   }
 
   virtual MediaDecoderOwner::NextFrameStatus NextFrameStatus() { return mNextFrameStatus; }

dom/media/eme/MediaKeyStatusMap.cpp

@@ -42,21 +42,27 @@ MediaKeyStatusMap::GetParentObject() const
   return mParent;
 }
 
-MediaKeyStatus
-MediaKeyStatusMap::Get(const ArrayBufferViewOrArrayBuffer& aKey) const
+void
+MediaKeyStatusMap::Get(JSContext* aCx,
+                       const ArrayBufferViewOrArrayBuffer& aKey,
+                       JS::MutableHandle<JS::Value> aOutValue,
+                       ErrorResult& aOutRv) const
 {
   ArrayData keyId = GetArrayBufferViewOrArrayBufferData(aKey);
   if (!keyId.IsValid()) {
-    return MediaKeyStatus::Internal_error;
+    aOutValue.setUndefined();
+    return;
   }
-
   for (const KeyStatus& status : mStatuses) {
     if (keyId == status.mKeyId) {
-      return status.mStatus;
+      bool ok = ToJSValue(aCx, status.mStatus, aOutValue);
+      if (!ok) {
+        aOutRv.NoteJSContextException(aCx);
+      }
+      return;
     }
   }
-
-  return MediaKeyStatus::Internal_error;
+  aOutValue.setUndefined();
 }
 
 bool

dom/media/eme/MediaKeyStatusMap.h

@@ -44,7 +44,10 @@ public:
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  MediaKeyStatus Get(const ArrayBufferViewOrArrayBuffer& aKey) const;
+  void Get(JSContext* aCx,
+           const ArrayBufferViewOrArrayBuffer& aKey,
+           JS::MutableHandle<JS::Value> aOutValue,
+           ErrorResult& aOutRv) const;
   bool Has(const ArrayBufferViewOrArrayBuffer& aKey) const;
   uint32_t Size() const;
 

dom/media/fmp4/MP4Decoder.cpp

@@ -171,6 +171,14 @@ MP4Decoder::CanHandleMediaType(const nsAString& aContentType,
                             aDiagnostics);
 }
 
+/* static */
+bool
+MP4Decoder::IsH264(const nsACString& aMimeType)
+{
+  return aMimeType.EqualsLiteral("video/mp4") ||
+         aMimeType.EqualsLiteral("video/avc");
+}
+
 /* static */
 bool
 MP4Decoder::IsEnabled()

dom/media/fmp4/MP4Decoder.h

@@ -38,6 +38,11 @@ public:
   static bool CanHandleMediaType(const nsAString& aMIMEType,
                                  DecoderDoctorDiagnostics* aDiagnostics);
 
+  // Return true if aMimeType is a one of the strings used by our demuxers to
+  // identify H264. Does not parse general content type strings, i.e. white
+  // space matters.
+  static bool IsH264(const nsACString& aMimeType);
+
   // Returns true if the MP4 backend is preffed on.
   static bool IsEnabled();
 

dom/media/omx/MediaOmxCommonDecoder.cpp

@@ -231,8 +231,8 @@ MediaOmxCommonDecoder::CallSeek(const SeekTarget& aTarget, dom::Promise* aPromis
     return;
   }
 
+  DiscardOngoingSeekIfExists();
   mSeekDOMPromise = aPromise;
-  mSeekRequest.DisconnectIfExists();
   mSeekRequest.Begin(mAudioOffloadPlayer->Seek(aTarget)
     ->Then(AbstractThread::MainThread(), __func__, static_cast<MediaDecoder*>(this),
            &MediaDecoder::OnSeekResolved, &MediaDecoder::OnSeekRejected));

dom/media/platforms/PDMFactory.cpp

@@ -46,6 +46,8 @@
 
 #include "DecoderDoctorDiagnostics.h"
 
+#include "MP4Decoder.h"
+
 
 namespace mozilla {
 
@@ -189,7 +191,7 @@ PDMFactory::CreateDecoderWithPDM(PlatformDecoderModule* aPDM,
   CreateDecoderParams params = aParams;
   params.mCallback = callback;
 
-  if (H264Converter::IsH264(config)) {
+  if (MP4Decoder::IsH264(config.mMimeType)) {
     RefPtr<H264Converter> h = new H264Converter(aPDM, params);
     const nsresult rv = h->GetLastError();
     if (NS_SUCCEEDED(rv) || rv == NS_ERROR_NOT_INITIALIZED) {

dom/media/platforms/agnostic/VPXDecoder.h

@@ -39,7 +39,9 @@ public:
     VP9 = 1 << 1
   };
 
-  // Return true if mimetype is a VPX codec of given types.
+  // Return true if aMimeType is a one of the strings used by our demuxers to
+  // identify VPX of the specified type. Does not parse general content type
+  // strings, i.e. white space matters.
   static bool IsVPX(const nsACString& aMimeType, uint8_t aCodecMask=VP8|VP9);
   static bool IsVP8(const nsACString& aMimeType);
   static bool IsVP9(const nsACString& aMimeType);

dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp

@@ -16,6 +16,7 @@
 #include "MediaInfo.h"
 #include "nsClassHashtable.h"
 #include "GMPDecoderModule.h"
+#include "MP4Decoder.h"
 
 namespace mozilla {
 
@@ -292,9 +293,7 @@ EMEDecoderModule::CreateAudioDecoder(const CreateDecoderParams& aParams)
 PlatformDecoderModule::ConversionRequired
 EMEDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
 {
-  if (aConfig.IsVideo() &&
-      (aConfig.mMimeType.EqualsLiteral("video/avc") ||
-       aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
+  if (aConfig.IsVideo() && MP4Decoder::IsH264(aConfig.mMimeType)) {
     return kNeedAVCC;
   } else {
     return kNeedNone;

dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp

@@ -8,6 +8,7 @@
 #include "GMPVideoEncodedFrameImpl.h"
 #include "mozilla/CDMProxy.h"
 #include "MediaData.h"
+#include "MP4Decoder.h"
 #include "VPXDecoder.h"
 
 namespace mozilla {
@@ -37,8 +38,7 @@ void
 EMEVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
   VideoInfo config = GetConfig();
-  if (config.mMimeType.EqualsLiteral("video/avc") ||
-      config.mMimeType.EqualsLiteral("video/mp4")) {
+  if (MP4Decoder::IsH264(config.mMimeType)) {
     aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
   } else if (VPXDecoder::IsVP8(config.mMimeType)) {
     aTags.AppendElement(NS_LITERAL_CSTRING("vp8"));

dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp

@@ -16,6 +16,7 @@
 #include "mozilla/StaticMutex.h"
 #include "gmp-audio-decode.h"
 #include "gmp-video-decode.h"
+#include "MP4Decoder.h"
 #include "VPXDecoder.h"
 #ifdef XP_WIN
 #include "WMFDecoderModule.h"
@@ -49,8 +50,7 @@ CreateDecoderWrapper(MediaDataDecoderCallback* aCallback)
 already_AddRefed<MediaDataDecoder>
 GMPDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
 {
-  if (!aParams.mConfig.mMimeType.EqualsLiteral("video/avc") &&
-      !aParams.mConfig.mMimeType.EqualsLiteral("video/mp4") &&
+  if (!MP4Decoder::IsH264(aParams.mConfig.mMimeType) &&
       !VPXDecoder::IsVP8(aParams.mConfig.mMimeType) &&
       !VPXDecoder::IsVP9(aParams.mConfig.mMimeType)) {
     return nullptr;
@@ -93,9 +93,7 @@ PlatformDecoderModule::ConversionRequired
 GMPDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
 {
   // GMPVideoCodecType::kGMPVideoCodecH264 specifies that encoded frames must be in AVCC format.
-  if (aConfig.IsVideo() &&
-      (aConfig.mMimeType.EqualsLiteral("video/avc") ||
-       aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
+  if (aConfig.IsVideo() && MP4Decoder::IsH264(aConfig.mMimeType)) {
     return kNeedAVCC;
   } else {
     return kNeedNone;
@@ -203,8 +201,7 @@ GMPDecoderModule::PreferredGMP(const nsACString& aMimeType)
     }
   }
 
-  if (aMimeType.EqualsLiteral("video/avc") ||
-      aMimeType.EqualsLiteral("video/mp4")) {
+  if (MP4Decoder::IsH264(aMimeType)) {
     switch (MediaPrefs::GMPH264Preferred()) {
       case 1: rv.emplace(nsCString(kEMEKeySystemClearkey)); break;
       case 2: rv.emplace(nsCString(kEMEKeySystemPrimetime)); break;
@@ -220,18 +217,12 @@ bool
 GMPDecoderModule::SupportsMimeType(const nsACString& aMimeType,
                                    const Maybe<nsCString>& aGMP)
 {
-  const bool isAAC = aMimeType.EqualsLiteral("audio/mp4a-latm");
-  const bool isH264 = aMimeType.EqualsLiteral("video/avc") ||
-                      aMimeType.EqualsLiteral("video/mp4");
-  const bool isVP8 = VPXDecoder::IsVP8(aMimeType);
-  const bool isVP9 = VPXDecoder::IsVP9(aMimeType);
-
   StaticMutexAutoLock lock(sGMPCodecsMutex);
   for (GMPCodecs& gmp : sGMPCodecs) {
-    if (((isAAC && gmp.mHasAAC) ||
-         (isH264 && gmp.mHasH264) ||
-         (isVP8 && gmp.mHasVP8) ||
-         (isVP9 && gmp.mHasVP9)) &&
+    if (((aMimeType.EqualsLiteral("audio/mp4a-latm") && gmp.mHasAAC) ||
+         (MP4Decoder::IsH264(aMimeType) && gmp.mHasH264) ||
+         (VPXDecoder::IsVP8(aMimeType) && gmp.mHasVP8) ||
+         (VPXDecoder::IsVP9(aMimeType) && gmp.mHasVP9)) &&
         (aGMP.isNothing() || aGMP.value().EqualsASCII(gmp.mKeySystem))) {
       return true;
     }

dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp

@@ -156,8 +156,7 @@ GMPVideoDecoder::GMPVideoDecoder(const GMPVideoDecoderParams& aParams)
 void
 GMPVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
-  if (mConfig.mMimeType.EqualsLiteral("video/avc") ||
-      mConfig.mMimeType.EqualsLiteral("video/mp4")) {
+  if (MP4Decoder::IsH264(mConfig.mMimeType)) {
     aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
     const Maybe<nsCString> gmp(
       GMPDecoderModule::PreferredGMP(NS_LITERAL_CSTRING("video/avc")));
@@ -249,8 +248,7 @@ GMPVideoDecoder::GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
 
   codec.mGMPApiVersion = kGMPVersion33;
   nsTArray<uint8_t> codecSpecific;
-  if (mConfig.mMimeType.EqualsLiteral("video/avc") ||
-      mConfig.mMimeType.EqualsLiteral("video/mp4")) {
+  if (MP4Decoder::IsH264(mConfig.mMimeType)) {
     codec.mCodecType = kGMPVideoCodecH264;
     codecSpecific.AppendElement(0); // mPacketizationMode.
     codecSpecific.AppendElements(mConfig.mExtraData->Elements(),

dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp

@@ -10,6 +10,8 @@
 #include "ImageContainer.h"
 
 #include "MediaInfo.h"
+#include "VPXDecoder.h"
+#include "MP4Decoder.h"
 
 #include "FFmpegVideoDecoder.h"
 #include "FFmpegLog.h"
@@ -338,7 +340,7 @@ FFmpegVideoDecoder<LIBAV_VER>::~FFmpegVideoDecoder()
 AVCodecID
 FFmpegVideoDecoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
 {
-  if (aMimeType.EqualsLiteral("video/avc") || aMimeType.EqualsLiteral("video/mp4")) {
+  if (MP4Decoder::IsH264(aMimeType)) {
     return AV_CODEC_ID_H264;
   }
 
@@ -347,13 +349,13 @@ FFmpegVideoDecoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
   }
 
 #if LIBAVCODEC_VERSION_MAJOR >= 54
-  if (aMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
+  if (VPXDecoder::IsVP8(aMimeType)) {
     return AV_CODEC_ID_VP8;
   }
 #endif
 
 #if LIBAVCODEC_VERSION_MAJOR >= 55
-  if (aMimeType.EqualsLiteral("video/webm; codecs=vp9")) {
+  if (VPXDecoder::IsVP9(aMimeType)) {
     return AV_CODEC_ID_VP9;
   }
 #endif

dom/media/platforms/omx/OmxPlatformLayer.cpp

@@ -13,6 +13,7 @@
 #include "GonkOmxPlatformLayer.h"
 #endif
 
+#include "VPXDecoder.h"
 
 #ifdef LOG
 #undef LOG
@@ -278,7 +279,7 @@ OmxPlatformLayer::CompressionFormat()
     return OMX_VIDEO_CodingMPEG4;
   } else if (mInfo->mMimeType.EqualsLiteral("video/3gpp")) {
     return OMX_VIDEO_CodingH263;
-  } else if (mInfo->mMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
+  } else if (VPXDecoder::IsVP8(mInfo->mMimeType)) {
     return static_cast<OMX_VIDEO_CODINGTYPE>(OMX_VIDEO_CodingVP8);
   } else {
     MOZ_ASSERT_UNREACHABLE("Unsupported compression format");

dom/media/platforms/wmf/WMFDecoderModule.cpp

@@ -25,6 +25,8 @@
 #include "prsystem.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/StaticMutex.h"
+#include "MP4Decoder.h"
+#include "VPXDecoder.h"
 
 namespace mozilla {
 
@@ -193,9 +195,7 @@ WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType,
        WMFDecoderModule::HasAAC()) {
     return true;
   }
-  if ((aMimeType.EqualsLiteral("video/avc") ||
-       aMimeType.EqualsLiteral("video/mp4")) &&
-       WMFDecoderModule::HasH264()) {
+  if (MP4Decoder::IsH264(aMimeType) && WMFDecoderModule::HasH264()) {
     return true;
   }
   if (aMimeType.EqualsLiteral("audio/mpeg") &&
@@ -203,11 +203,11 @@ WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType,
     return true;
   }
   if (MediaPrefs::PDMWMFIntelDecoderEnabled() && sDXVAEnabled) {
-    if (aMimeType.EqualsLiteral("video/webm; codecs=vp8") &&
+    if (VPXDecoder::IsVP8(aMimeType) &&
         CanCreateWMFDecoder<CLSID_WebmMfVp8Dec>()) {
       return true;
     }
-    if (aMimeType.EqualsLiteral("video/webm; codecs=vp9") &&
+    if (VPXDecoder::IsVP9(aMimeType) &&
         CanCreateWMFDecoder<CLSID_WebmMfVp9Dec>()) {
       return true;
     }
@@ -220,9 +220,7 @@ WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType,
 PlatformDecoderModule::ConversionRequired
 WMFDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
 {
-  if (aConfig.IsVideo() &&
-      (aConfig.mMimeType.EqualsLiteral("video/avc") ||
-       aConfig.mMimeType.EqualsLiteral("video/mp4"))) {
+  if (aConfig.IsVideo() && MP4Decoder::IsH264(aConfig.mMimeType)) {
     return kNeedAnnexB;
   } else {
     return kNeedNone;

dom/media/platforms/wmf/WMFVideoMFTManager.cpp

@@ -30,6 +30,8 @@
 #include "nsPrintfCString.h"
 #include "MediaTelemetryConstants.h"
 #include "GMPUtils.h" // For SplitAt. TODO: Move SplitAt to a central place.
+#include "MP4Decoder.h"
+#include "VPXDecoder.h"
 
 #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
 
@@ -95,12 +97,11 @@ WMFVideoMFTManager::WMFVideoMFTManager(
   MOZ_COUNT_CTOR(WMFVideoMFTManager);
 
   // Need additional checks/params to check vp8/vp9
-  if (aConfig.mMimeType.EqualsLiteral("video/mp4") ||
-      aConfig.mMimeType.EqualsLiteral("video/avc")) {
+  if (MP4Decoder::IsH264(aConfig.mMimeType)) {
     mStreamType = H264;
-  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
+  } else if (VPXDecoder::IsVP8(aConfig.mMimeType)) {
     mStreamType = VP8;
-  } else if (aConfig.mMimeType.EqualsLiteral("video/webm; codecs=vp9")) {
+  } else if (VPXDecoder::IsVP9(aConfig.mMimeType)) {
     mStreamType = VP9;
   } else {
     mStreamType = Unknown;

dom/media/platforms/wrappers/H264Converter.cpp

@@ -241,12 +241,4 @@ H264Converter::UpdateConfigFromExtraData(MediaByteBuffer* aExtraData)
   mCurrentConfig.mExtraData = aExtraData;
 }
 
-/* static */
-bool
-H264Converter::IsH264(const TrackInfo& aConfig)
-{
-  return aConfig.mMimeType.EqualsLiteral("video/avc") ||
-    aConfig.mMimeType.EqualsLiteral("video/mp4");
-}
-
 } // namespace mozilla

dom/media/platforms/wrappers/H264Converter.h

@@ -39,8 +39,6 @@ public:
     return "H264Converter decoder (pending)";
   }
 
-  // Return true if mimetype is H.264.
-  static bool IsH264(const TrackInfo& aConfig);
   nsresult GetLastError() const { return mLastError; }
 
 private:

dom/media/test/test_eme_playback.html

@@ -38,8 +38,15 @@ function KeysChangeFunc(session, keys, token) {
 
     var keyList = [];
     var valueList = [];
-
     var map = session.keyStatuses;
+
+    // Test that accessing keys not known to the CDM has expected behaviour.
+    var absentKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
+                                    0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
+    is(map.has(absentKey), false, "Shouldn't have a key that's not in the media");
+    is(map.get(absentKey), undefined, "Unknown keys should undefined status");
+
+    // Verify known keys have expected status.
     for (var [key, val] of map.entries()) {
       is(key.constructor, ArrayBuffer, "keyId should be ArrayBuffer");
       ok(map.has(key), "MediaKeyStatusMap.has() should work.");

dom/plugins/base/nsPluginInstanceOwner.cpp

@@ -3468,15 +3468,6 @@ void nsPluginInstanceOwner::FixUpPluginWindow(int32_t inPaintState)
     mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top;
     mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left;
   }
-  else if (!XRE_IsParentProcess())
-  {
-    // For e10s we only support async windowless plugin. This means that
-    // we're always going to allocate a full window for the plugin to draw
-    // for even if the plugin is mostly outside of the scroll port. Thus
-    // we never trim the window to the bounds of the widget.
-    mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top + mPluginWindow->height;
-    mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left + mPluginWindow->width;
-  }
   else if (inPaintState == ePluginPaintEnable)
   {
     mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top + widgetClip.height;

dom/webidl/MediaKeyStatusMap.webidl

@@ -25,5 +25,6 @@ interface MediaKeyStatusMap {
   iterable<ArrayBuffer,MediaKeyStatus>;
   readonly attribute unsigned long size;
   boolean has (BufferSource keyId);
-  MediaKeyStatus get (BufferSource keyId);
+  [Throws]
+  any get (BufferSource keyId);
 };

js/xpconnect/src/XPCMaps.cpp

@@ -34,39 +34,9 @@ MatchIIDPtrKey(const PLDHashEntryHdr* entry, const void* key)
 }
 
 static PLDHashNumber
-HashNativeKey(const void* key)
+HashNativeKey(const void* data)
 {
-    auto Key = static_cast<const XPCNativeSetKey*>(key);
-
-    PLDHashNumber h = 0;
-
-    XPCNativeSet* Set = Key->GetBaseSet();
-    XPCNativeInterface* Addition = Key->GetAddition();
-    uint16_t Position = Key->GetPosition();
-
-    if (!Set) {
-        MOZ_ASSERT(Addition, "bad key");
-        // This would be an XOR like below.
-        // But "0 ^ x == x". So it does not matter.
-        h = (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
-    } else {
-        XPCNativeInterface** Current = Set->GetInterfaceArray();
-        uint16_t count = Set->GetInterfaceCount();
-        if (Addition) {
-            count++;
-            for (uint16_t i = 0; i < count; i++) {
-                if (i == Position)
-                    h ^= (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
-                else
-                    h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
-            }
-        } else {
-            for (uint16_t i = 0; i < count; i++)
-                h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
-        }
-    }
-
-    return h;
+    return static_cast<const XPCNativeSetKey*>(data)->Hash();
 }
 
 /***************************************************************************/

js/xpconnect/src/XPCMaps.h

@@ -402,8 +402,8 @@ public:
 
     inline XPCNativeSet* Add(const XPCNativeSetKey* key, XPCNativeSet* set)
     {
-        NS_PRECONDITION(key,"bad param");
-        NS_PRECONDITION(set,"bad param");
+        MOZ_ASSERT(key, "bad param");
+        MOZ_ASSERT(set, "bad param");
         auto entry = static_cast<Entry*>(mTable.Add(key, mozilla::fallible));
         if (!entry)
             return nullptr;
@@ -413,15 +413,9 @@ public:
         return set;
     }
 
-    inline XPCNativeSet* Add(XPCNativeSet* set)
-    {
-        XPCNativeSetKey key(set, nullptr, 0);
-        return Add(&key, set);
-    }
-
     inline void Remove(XPCNativeSet* set)
     {
-        NS_PRECONDITION(set,"bad param");
+        MOZ_ASSERT(set, "bad param");
 
         XPCNativeSetKey key(set, nullptr, 0);
         mTable.Remove(&key);

js/xpconnect/src/XPCWrappedNativeInfo.cpp

@@ -423,6 +423,43 @@ XPCNativeInterface::DebugDump(int16_t depth)
 #endif
 }
 
+/***************************************************************************/
+// XPCNativeSetKey
+
+static PLDHashNumber
+HashPointer(const void* ptr)
+{
+    return NS_PTR_TO_UINT32(ptr) >> 2;
+}
+
+PLDHashNumber
+XPCNativeSetKey::Hash() const
+{
+    PLDHashNumber h = 0;
+
+    if (!mBaseSet) {
+        MOZ_ASSERT(mAddition, "bad key");
+        h ^= HashPointer(mAddition);
+    } else {
+        XPCNativeInterface** current = mBaseSet->GetInterfaceArray();
+        uint16_t count = mBaseSet->GetInterfaceCount();
+        if (mAddition) {
+            count++;
+            for (uint16_t i = 0; i < count; i++) {
+                if (i == mPosition)
+                    h ^= HashPointer(mAddition);
+                else
+                    h ^= HashPointer(*(current++));
+            }
+        } else {
+            for (uint16_t i = 0; i < count; i++)
+                h ^= HashPointer(*(current++));
+        }
+    }
+
+    return h;
+}
+
 /***************************************************************************/
 // XPCNativeSet
 
@@ -730,40 +767,35 @@ XPCNativeSet::NewInstance(XPCNativeInterface** array,
 
 // static
 XPCNativeSet*
-XPCNativeSet::NewInstanceMutate(XPCNativeSet*       otherSet,
+XPCNativeSet::NewInstanceMutate(XPCNativeSet* otherSet,
                                 XPCNativeInterface* newInterface,
-                                uint16_t            position)
+                                uint16_t position)
 {
+    MOZ_ASSERT(otherSet);
+
     if (!newInterface)
         return nullptr;
-    if (otherSet && position > otherSet->mInterfaceCount)
+    if (position > otherSet->mInterfaceCount)
         return nullptr;
 
     // Use placement new to create an object with the right amount of space
     // to hold the members array
     int size = sizeof(XPCNativeSet);
-    if (otherSet)
-        size += otherSet->mInterfaceCount * sizeof(XPCNativeInterface*);
+    size += otherSet->mInterfaceCount * sizeof(XPCNativeInterface*);
     void* place = new char[size];
     XPCNativeSet* obj = new(place) XPCNativeSet();
 
-    if (otherSet) {
-        obj->mMemberCount = otherSet->GetMemberCount() +
-            newInterface->GetMemberCount();
-        obj->mInterfaceCount = otherSet->mInterfaceCount + 1;
+    obj->mMemberCount = otherSet->GetMemberCount() +
+        newInterface->GetMemberCount();
+    obj->mInterfaceCount = otherSet->mInterfaceCount + 1;
 
-        XPCNativeInterface** src = otherSet->mInterfaces;
-        XPCNativeInterface** dest = obj->mInterfaces;
-        for (uint16_t i = 0; i < obj->mInterfaceCount; i++) {
-            if (i == position)
-                *dest++ = newInterface;
-            else
-                *dest++ = *src++;
-        }
-    } else {
-        obj->mMemberCount = newInterface->GetMemberCount();
-        obj->mInterfaceCount = 1;
-        obj->mInterfaces[0] = newInterface;
+    XPCNativeInterface** src = otherSet->mInterfaces;
+    XPCNativeInterface** dest = obj->mInterfaces;
+    for (uint16_t i = 0; i < obj->mInterfaceCount; i++) {
+        if (i == position)
+            *dest++ = newInterface;
+        else
+            *dest++ = *src++;
     }
 
     return obj;

js/xpconnect/src/xpcprivate.h

@@ -1291,22 +1291,24 @@ private:
 class XPCNativeSetKey final
 {
 public:
-    explicit XPCNativeSetKey(XPCNativeSet*       BaseSet  = nullptr,
-                             XPCNativeInterface* Addition = nullptr,
-                             uint16_t            Position = 0)
-        : mBaseSet(BaseSet), mAddition(Addition), mPosition(Position) {}
+    explicit XPCNativeSetKey(XPCNativeSet* baseSet = nullptr,
+                             XPCNativeInterface* addition = nullptr,
+                             uint16_t position = 0)
+        : mBaseSet(baseSet), mAddition(addition), mPosition(position) {}
     ~XPCNativeSetKey() {}
 
-    XPCNativeSet*           GetBaseSet()  const {return mBaseSet;}
-    XPCNativeInterface*     GetAddition() const {return mAddition;}
-    uint16_t                GetPosition() const {return mPosition;}
+    XPCNativeSet* GetBaseSet() const {return mBaseSet;}
+    XPCNativeInterface* GetAddition() const {return mAddition;}
+    uint16_t GetPosition() const {return mPosition;}
+
+    PLDHashNumber Hash() const;
 
     // Allow shallow copy
 
 private:
-    XPCNativeSet*           mBaseSet;
-    XPCNativeInterface*     mAddition;
-    uint16_t                mPosition;
+    XPCNativeSet* mBaseSet;
+    XPCNativeInterface* mAddition;
+    uint16_t mPosition;
 };
 
 /***************************************************************************/

layout/generic/nsBlockFrame.cpp

@@ -7017,20 +7017,13 @@ nsBlockFrame::RenumberLists(nsPresContext* aPresContext)
     // <ol reversed> case, or some other case with a negative increment: count
     // up the child list
     ordinal = 0;
-    for (nsIContent* kid = mContent->GetFirstChild(); kid;
-         kid = kid->GetNextSibling()) {
-      if (kid->IsHTMLElement(nsGkAtoms::li)) {
-        // FIXME: This isn't right in terms of what CSS says to do for
-        // overflow of counters (but it only matters when this node has
-        // more than numeric_limits<int32_t>::max() children).
-        ordinal -= increment;
-      }
-    }
+    nsBlockFrame* block = static_cast<nsBlockFrame*>(FirstInFlow());
+    RenumberListsInBlock(aPresContext, block, &ordinal, 0, -increment, true);
   }
 
   // Get to first-in-flow
   nsBlockFrame* block = static_cast<nsBlockFrame*>(FirstInFlow());
-  return RenumberListsInBlock(aPresContext, block, &ordinal, 0, increment);
+  return RenumberListsInBlock(aPresContext, block, &ordinal, 0, increment, false);
 }
 
 bool
@@ -7038,7 +7031,8 @@ nsBlockFrame::RenumberListsInBlock(nsPresContext* aPresContext,
                                    nsBlockFrame* aBlockFrame,
                                    int32_t* aOrdinal,
                                    int32_t aDepth,
-                                   int32_t aIncrement)
+                                   int32_t aIncrement,
+                                   bool aForCounting)
 {
   // Examine each line in the block
   bool foundValidLine;
@@ -7055,8 +7049,9 @@ nsBlockFrame::RenumberListsInBlock(nsPresContext* aPresContext,
     int32_t n = line->GetChildCount();
     while (--n >= 0) {
       bool kidRenumberedABullet = RenumberListsFor(aPresContext, kid, aOrdinal,
-                                                   aDepth, aIncrement);
-      if (kidRenumberedABullet) {
+                                                   aDepth, aIncrement,
+                                                   aForCounting);
+      if (!aForCounting && kidRenumberedABullet) {
         line->MarkDirty();
         renumberedABullet = true;
       }
@@ -7081,7 +7076,8 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
                                nsIFrame* aKid,
                                int32_t* aOrdinal,
                                int32_t aDepth,
-                               int32_t aIncrement)
+                               int32_t aIncrement,
+                               bool aForCounting)
 {
   NS_PRECONDITION(aPresContext && aKid && aOrdinal, "null params are immoral!");
 
@@ -7121,23 +7117,31 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
     if (listItem) {
       nsBulletFrame* bullet = listItem->GetBullet();
       if (bullet) {
-        bool changed;
-        *aOrdinal = bullet->SetListItemOrdinal(*aOrdinal, &changed, aIncrement);
-        if (changed) {
-          kidRenumberedABullet = true;
+        if (!aForCounting) {
+          bool changed;
+          *aOrdinal = bullet->SetListItemOrdinal(*aOrdinal, &changed, aIncrement);
+          if (changed) {
+            kidRenumberedABullet = true;
 
-          // The ordinal changed - mark the bullet frame, and any
-          // intermediate frames between it and the block (are there
-          // ever any?), dirty.
-          // The calling code will make the necessary FrameNeedsReflow
-          // call for the list ancestor.
-          bullet->AddStateBits(NS_FRAME_IS_DIRTY);
-          nsIFrame *f = bullet;
-          do {
-            nsIFrame *parent = f->GetParent();
-            parent->ChildIsDirty(f);
-            f = parent;
-          } while (f != listItem);
+            // The ordinal changed - mark the bullet frame, and any
+            // intermediate frames between it and the block (are there
+            // ever any?), dirty.
+            // The calling code will make the necessary FrameNeedsReflow
+            // call for the list ancestor.
+            bullet->AddStateBits(NS_FRAME_IS_DIRTY);
+            nsIFrame *f = bullet;
+            do {
+              nsIFrame *parent = f->GetParent();
+              parent->ChildIsDirty(f);
+              f = parent;
+            } while (f != listItem);
+          }
+        } else {
+          // We're only counting the number of children,
+          // not restyling them. Don't take |value|
+          // into account when incrementing the ordinal
+          // or dirty the bullet.
+          *aOrdinal += aIncrement;
         }
       }
 
@@ -7145,7 +7149,8 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
       // should be numbered too; especially since the list-item is
       // itself (ASSUMED!) not to be a counter-resetter.
       bool meToo = RenumberListsInBlock(aPresContext, listItem, aOrdinal,
-                                        aDepth + 1, aIncrement);
+                                        aDepth + 1, aIncrement,
+                                        aForCounting);
       if (meToo) {
         kidRenumberedABullet = true;
       }
@@ -7164,7 +7169,8 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
       if (kidBlock) {
         kidRenumberedABullet = RenumberListsInBlock(aPresContext, kidBlock,
                                                     aOrdinal, aDepth + 1,
-                                                    aIncrement);
+                                                    aIncrement,
+                                                    aForCounting);
       }
     }
   }

layout/generic/nsBlockFrame.h

@@ -787,15 +787,44 @@ protected:
   // reflow.
   bool RenumberLists(nsPresContext* aPresContext);
 
+  /**
+   * Renumber lists for a single block frame
+   * @param aOrdinal Ordinal number to start counting at.
+   *        Modifies this number for each associated list
+   *        item. Changes in the numbering due to setting
+   *        the |value| attribute are included if |aForCounting|
+   *        is false. This value is both an input and output
+   *        of this function, with the output value being the
+   *        next ordinal number to be used.
+   * @param aIncrement Amount to increase by after visiting each associated
+   *        list item, unless overridden by |value|.
+   * @param aForCounting Whether we are counting the elements or actually
+   *        restyling them. When true, this simply visits all children,
+   *        ignoring |<li value="..">| changes, effectively counting them
+   *        and storing the result in |aOrdinal|. This is useful for
+   *        |<ol reversed>|, where we need to count the number of
+   *        applicable child list elements before numbering. When false,
+   *        this will restyle all applicable descendants, and the next
+   *        ordinal value will be stored in |aOrdinal|, taking into account
+   *        any changes from |<li value="..">|.
+   * @param aDepth Current depth in frame tree from root list element.
+   */
   static bool RenumberListsInBlock(nsPresContext* aPresContext,
                                    nsBlockFrame* aBlockFrame,
                                    int32_t* aOrdinal,
                                    int32_t aDepth,
-                                   int32_t aIncrement);
+                                   int32_t aIncrement,
+                                   bool aForCounting);
 
+  /**
+   * Renumber the lists for a single frame.
+   * May recurse into RenumberListsInBlock.
+   * See RenumberListsInBlock for description of parameters.
+   */
   static bool RenumberListsFor(nsPresContext* aPresContext, nsIFrame* aKid,
                                int32_t* aOrdinal, int32_t aDepth,
-                               int32_t aIncrement);
+                               int32_t aIncrement,
+                               bool aForCounting);
 
   static bool FrameStartsCounterScope(nsIFrame* aFrame);
 

media/ffvpx/README_MOZILLA

@@ -1,6 +1,6 @@
 This directory contains files used in gecko builds from FFmpeg
 (http://ffmpeg.org). The current files are from FFmpeg as of
-revision n3.0.2
+revision n3.1.1-6-g86f9228
 All source files match their path from the library's source archive.
 
 Currently, we only use the vp8 and vp9 portion of the library, and only on x86

media/ffvpx/config_darwin32.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 0
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 1
 #define HAVE_RDTSC 0
 #define HAVE_SARESTART 1
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 #define HAVE_CABS 1
 #define HAVE_CEXP 1
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 0
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1
 #define HAVE_SYSCONF 1
-#define HAVE_SYSCTL 1
 #define HAVE_USLEEP 1
 #define HAVE_UTGETOSTYPEFROMSTRING 1
 #define HAVE_VIRTUALALLOC 0
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 1
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,12 +370,14 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
 #define HAVE_MAKEINFO_HTML 1
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -490,25 +495,35 @@
 #define CONFIG_SCHANNEL 0
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +595,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +624,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +653,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +728,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +754,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +822,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +841,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +887,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +918,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1026,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1039,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1072,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1098,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1105,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1122,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1167,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1241,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1344,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1363,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1521,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1540,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1554,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1582,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1625,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1659,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1705,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1724,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1736,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1768,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1779,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1831,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1861,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1871,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1892,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1963,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2158,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_darwin64.asm

@@ -56,6 +56,7 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
+%define HAVE_MIPS32R5 0
 %define HAVE_MIPS64R2 0
 %define HAVE_MIPS32R6 0
 %define HAVE_MIPS64R6 0
@@ -99,6 +100,7 @@
 %define HAVE_I686_EXTERNAL 0
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
+%define HAVE_MIPS32R5_EXTERNAL 0
 %define HAVE_MIPS64R2_EXTERNAL 0
 %define HAVE_MIPS32R6_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
@@ -142,6 +144,7 @@
 %define HAVE_I686_INLINE 0
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
+%define HAVE_MIPS32R5_INLINE 0
 %define HAVE_MIPS64R2_INLINE 0
 %define HAVE_MIPS32R6_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
@@ -169,6 +172,7 @@
 %define HAVE_MM_EMPTY 1
 %define HAVE_RDTSC 0
 %define HAVE_SARESTART 1
+%define HAVE_SEM_TIMEDWAIT 1
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 %define HAVE_CABS 1
 %define HAVE_CEXP 1
@@ -184,6 +188,7 @@
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+%define HAVE_DISPATCH_DISPATCH_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 %define HAVE_DEV_IC_BT8XX_H 0
@@ -332,6 +337,7 @@
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 %define HAVE_STRUCT_POLLFD 1
 %define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 %define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -349,12 +355,14 @@
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
 %define HAVE_MAKEINFO_HTML 1
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
 %define HAVE_SDL 0
 %define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
 %define HAVE_THREADS 1
+%define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
@@ -401,6 +409,7 @@
 %define CONFIG_GMP 0
 %define CONFIG_GNUTLS 0
 %define CONFIG_ICONV 0
+%define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
 %define CONFIG_LIBASS 0
 %define CONFIG_LIBBLURAY 0
@@ -409,7 +418,7 @@
 %define CONFIG_LIBCDIO 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
-%define CONFIG_LIBDCADEC 0
+%define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
@@ -421,7 +430,6 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
 %define CONFIG_LIBKVAZAAR 0
-%define CONFIG_LIBMFX 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
 %define CONFIG_LIBNUT 0
@@ -444,7 +452,6 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 0
 %define CONFIG_LIBTWOLAME 0
-%define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBVO_AMRWBENC 0
@@ -464,9 +471,8 @@
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 0
-%define CONFIG_MMAL 0
+%define CONFIG_MEDIACODEC 0
 %define CONFIG_NETCDF 0
-%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
@@ -474,25 +480,35 @@
 %define CONFIG_SCHANNEL 0
 %define CONFIG_SDL 0
 %define CONFIG_SECURETRANSPORT 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_AUDIOTOOLBOX 0
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
+%define CONFIG_D3D11VA 0
+%define CONFIG_DXVA2 0
+%define CONFIG_LIBMFX 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 0
+%define CONFIG_OMX 0
+%define CONFIG_VAAPI 0
+%define CONFIG_VDA 0
+%define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_XVMC 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
+%define CONFIG_OMX_RPI 0
 %define CONFIG_RUNTIME_CPUDETECT 1
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 1
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 0
 %define CONFIG_SWSCALE_ALPHA 1
-%define CONFIG_D3D11VA 0
-%define CONFIG_DXVA2 0
-%define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
-%define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX 0
-%define CONFIG_XVMC 0
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 0
@@ -564,6 +580,7 @@
 %define CONFIG_IIRFILTER 0
 %define CONFIG_IMDCT15 0
 %define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 0
 %define CONFIG_IVIDSP 0
 %define CONFIG_JPEGTABLES 0
 %define CONFIG_LGPLV3 0
@@ -592,19 +609,24 @@
 %define CONFIG_RV34DSP 0
 %define CONFIG_SINEWIN 0
 %define CONFIG_SNAPPY 0
+%define CONFIG_SRTP 0
 %define CONFIG_STARTCODE 0
 %define CONFIG_TEXTUREDSP 0
 %define CONFIG_TEXTUREDSPENC 0
 %define CONFIG_TPELDSP 0
+%define CONFIG_VAAPI_ENCODE 0
+%define CONFIG_VC1DSP 0
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 0
 %define CONFIG_VP56DSP 0
 %define CONFIG_VP8DSP 1
+%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 0
 %define CONFIG_WMV2DSP 0
 %define CONFIG_AAC_ADTSTOASC_BSF 0
 %define CONFIG_CHOMP_BSF 0
 %define CONFIG_DUMP_EXTRADATA_BSF 0
+%define CONFIG_DCA_CORE_BSF 0
 %define CONFIG_H264_MP4TOANNEXB_BSF 0
 %define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 %define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -616,6 +638,7 @@
 %define CONFIG_NOISE_BSF 0
 %define CONFIG_REMOVE_EXTRADATA_BSF 0
 %define CONFIG_TEXT2MOVSUB_BSF 0
+%define CONFIG_VP9_SUPERFRAME_BSF 0
 %define CONFIG_AASC_DECODER 0
 %define CONFIG_AIC_DECODER 0
 %define CONFIG_ALIAS_PIX_DECODER 0
@@ -690,6 +713,7 @@
 %define CONFIG_H263P_DECODER 0
 %define CONFIG_H264_DECODER 0
 %define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_MEDIACODEC_DECODER 0
 %define CONFIG_H264_MMAL_DECODER 0
 %define CONFIG_H264_QSV_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
@@ -715,6 +739,8 @@
 %define CONFIG_KMVC_DECODER 0
 %define CONFIG_LAGARITH_DECODER 0
 %define CONFIG_LOCO_DECODER 0
+%define CONFIG_M101_DECODER 0
+%define CONFIG_MAGICYUV_DECODER 0
 %define CONFIG_MDEC_DECODER 0
 %define CONFIG_MIMIC_DECODER 0
 %define CONFIG_MJPEG_DECODER 0
@@ -781,6 +807,7 @@
 %define CONFIG_SDX2_DPCM_DECODER 0
 %define CONFIG_SGI_DECODER 0
 %define CONFIG_SGIRLE_DECODER 0
+%define CONFIG_SHEERVIDEO_DECODER 0
 %define CONFIG_SMACKER_DECODER 0
 %define CONFIG_SMC_DECODER 0
 %define CONFIG_SMVJPEG_DECODER 0
@@ -799,6 +826,7 @@
 %define CONFIG_TMV_DECODER 0
 %define CONFIG_TRUEMOTION1_DECODER 0
 %define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TRUEMOTION2RT_DECODER 0
 %define CONFIG_TSCC_DECODER 0
 %define CONFIG_TSCC2_DECODER 0
 %define CONFIG_TXD_DECODER 0
@@ -844,6 +872,7 @@
 %define CONFIG_XL_DECODER 0
 %define CONFIG_XWD_DECODER 0
 %define CONFIG_Y41P_DECODER 0
+%define CONFIG_YLC_DECODER 0
 %define CONFIG_YOP_DECODER 0
 %define CONFIG_YUV4_DECODER 0
 %define CONFIG_ZERO12V_DECODER 0
@@ -874,6 +903,7 @@
 %define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 %define CONFIG_DSICINAUDIO_DECODER 0
 %define CONFIG_DSS_SP_DECODER 0
+%define CONFIG_DST_DECODER 0
 %define CONFIG_EAC3_DECODER 0
 %define CONFIG_EVRC_DECODER 0
 %define CONFIG_FFWAVESYNTH_DECODER 0
@@ -981,6 +1011,7 @@
 %define CONFIG_ADPCM_G726LE_DECODER 0
 %define CONFIG_ADPCM_IMA_AMV_DECODER 0
 %define CONFIG_ADPCM_IMA_APC_DECODER 0
+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 %define CONFIG_ADPCM_IMA_DK3_DECODER 0
 %define CONFIG_ADPCM_IMA_DK4_DECODER 0
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -993,6 +1024,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 0
 %define CONFIG_ADPCM_IMA_WS_DECODER 0
 %define CONFIG_ADPCM_MS_DECODER 0
+%define CONFIG_ADPCM_MTAF_DECODER 0
 %define CONFIG_ADPCM_PSX_DECODER 0
 %define CONFIG_ADPCM_SBPRO_2_DECODER 0
 %define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1025,8 +1057,22 @@
 %define CONFIG_VPLAYER_DECODER 0
 %define CONFIG_WEBVTT_DECODER 0
 %define CONFIG_XSUB_DECODER 0
+%define CONFIG_AAC_AT_DECODER 0
+%define CONFIG_AC3_AT_DECODER 0
+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+%define CONFIG_ALAC_AT_DECODER 0
+%define CONFIG_AMR_NB_AT_DECODER 0
+%define CONFIG_EAC3_AT_DECODER 0
+%define CONFIG_GSM_MS_AT_DECODER 0
+%define CONFIG_ILBC_AT_DECODER 0
+%define CONFIG_MP1_AT_DECODER 0
+%define CONFIG_MP2_AT_DECODER 0
+%define CONFIG_MP3_AT_DECODER 0
+%define CONFIG_PCM_ALAW_AT_DECODER 0
+%define CONFIG_PCM_MULAW_AT_DECODER 0
+%define CONFIG_QDMC_AT_DECODER 0
+%define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBDCADEC_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1037,7 +1083,6 @@
 %define CONFIG_LIBOPUS_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 0
-%define CONFIG_LIBUTVIDEO_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 0
 %define CONFIG_LIBVPX_VP8_DECODER 0
 %define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1045,6 +1090,11 @@
 %define CONFIG_BINTEXT_DECODER 0
 %define CONFIG_XBIN_DECODER 0
 %define CONFIG_IDF_DECODER 0
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_AA_DEMUXER 0
 %define CONFIG_AAC_DEMUXER 0
 %define CONFIG_AC3_DEMUXER 0
@@ -1057,6 +1107,7 @@
 %define CONFIG_AEA_DEMUXER 0
 %define CONFIG_AFC_DEMUXER 0
 %define CONFIG_AIFF_DEMUXER 0
+%define CONFIG_AIX_DEMUXER 0
 %define CONFIG_AMR_DEMUXER 0
 %define CONFIG_ANM_DEMUXER 0
 %define CONFIG_APC_DEMUXER 0
@@ -1101,6 +1152,7 @@
 %define CONFIG_DTSHD_DEMUXER 0
 %define CONFIG_DV_DEMUXER 0
 %define CONFIG_DVBSUB_DEMUXER 0
+%define CONFIG_DVBTXT_DEMUXER 0
 %define CONFIG_DXA_DEMUXER 0
 %define CONFIG_EA_DEMUXER 0
 %define CONFIG_EA_CDATA_DEMUXER 0
@@ -1174,7 +1226,9 @@
 %define CONFIG_MPSUB_DEMUXER 0
 %define CONFIG_MSF_DEMUXER 0
 %define CONFIG_MSNWC_TCP_DEMUXER 0
+%define CONFIG_MTAF_DEMUXER 0
 %define CONFIG_MTV_DEMUXER 0
+%define CONFIG_MUSX_DEMUXER 0
 %define CONFIG_MV_DEMUXER 0
 %define CONFIG_MVI_DEMUXER 0
 %define CONFIG_MXF_DEMUXER 0
@@ -1275,6 +1329,7 @@
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 %define CONFIG_WEBVTT_DEMUXER 0
 %define CONFIG_WSAUD_DEMUXER 0
+%define CONFIG_WSD_DEMUXER 0
 %define CONFIG_WSVQA_DEMUXER 0
 %define CONFIG_WTV_DEMUXER 0
 %define CONFIG_WVE_DEMUXER 0
@@ -1293,8 +1348,14 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1445,6 +1506,11 @@
 %define CONFIG_TEXT_ENCODER 0
 %define CONFIG_WEBVTT_ENCODER 0
 %define CONFIG_XSUB_ENCODER 0
+%define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_ALAC_AT_ENCODER 0
+%define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_PCM_ALAW_AT_ENCODER 0
+%define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
@@ -1459,7 +1525,6 @@
 %define CONFIG_LIBSPEEX_ENCODER 0
 %define CONFIG_LIBTHEORA_ENCODER 0
 %define CONFIG_LIBTWOLAME_ENCODER 0
-%define CONFIG_LIBUTVIDEO_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 0
 %define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1474,13 +1539,21 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 0
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 0
+%define CONFIG_H264_VAAPI_ENCODER 0
+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 0
 %define CONFIG_NVENC_HEVC_ENCODER 0
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_HEVC_QSV_ENCODER 0
+%define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 0
+%define CONFIG_ABENCH_FILTER 0
 %define CONFIG_ACOMPRESSOR_FILTER 0
 %define CONFIG_ACROSSFADE_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
@@ -1494,6 +1567,7 @@
 %define CONFIG_AINTERLEAVE_FILTER 0
 %define CONFIG_ALIMITER_FILTER 0
 %define CONFIG_ALLPASS_FILTER 0
+%define CONFIG_ALOOP_FILTER 0
 %define CONFIG_AMERGE_FILTER 0
 %define CONFIG_AMETADATA_FILTER 0
 %define CONFIG_AMIX_FILTER 0
@@ -1536,10 +1610,13 @@
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
 %define CONFIG_EXTRASTEREO_FILTER 0
+%define CONFIG_FIREQUALIZER_FILTER 0
 %define CONFIG_FLANGER_FILTER 0
+%define CONFIG_HDCD_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
+%define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 0
 %define CONFIG_PAN_FILTER 0
 %define CONFIG_REPLAYGAIN_FILTER 0
@@ -1567,24 +1644,30 @@
 %define CONFIG_ALPHAMERGE_FILTER 0
 %define CONFIG_ATADENOISE_FILTER 0
 %define CONFIG_ASS_FILTER 0
+%define CONFIG_BENCH_FILTER 0
 %define CONFIG_BBOX_FILTER 0
 %define CONFIG_BLACKDETECT_FILTER 0
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_BWDIF_FILTER 0
 %define CONFIG_CHROMAKEY_FILTER 0
+%define CONFIG_CIESCOPE_FILTER 0
 %define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORKEY_FILTER 0
 %define CONFIG_COLORLEVELS_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
+%define CONFIG_COLORSPACE_FILTER 0
 %define CONFIG_CONVOLUTION_FILTER 0
 %define CONFIG_COPY_FILTER 0
+%define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 0
 %define CONFIG_CROP_FILTER 0
 %define CONFIG_CROPDETECT_FILTER 0
 %define CONFIG_CURVES_FILTER 0
+%define CONFIG_DATASCOPE_FILTER 0
 %define CONFIG_DCTDNOIZ_FILTER 0
 %define CONFIG_DEBAND_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
@@ -1607,6 +1690,7 @@
 %define CONFIG_FADE_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
 %define CONFIG_FIELD_FILTER 0
+%define CONFIG_FIELDHINT_FILTER 0
 %define CONFIG_FIELDMATCH_FILTER 0
 %define CONFIG_FIELDORDER_FILTER 0
 %define CONFIG_FIND_RECT_FILTER 0
@@ -1625,6 +1709,9 @@
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
 %define CONFIG_HQX_FILTER 0
+%define CONFIG_HWDOWNLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
@@ -1634,6 +1721,7 @@
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
 %define CONFIG_LENSCORRECTION_FILTER 0
+%define CONFIG_LOOP_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1665,7 +1753,9 @@
 %define CONFIG_PULLUP_FILTER 0
 %define CONFIG_QP_FILTER 0
 %define CONFIG_RANDOM_FILTER 0
+%define CONFIG_READVITC_FILTER 0
 %define CONFIG_REALTIME_FILTER 0
+%define CONFIG_REMAP_FILTER 0
 %define CONFIG_REMOVEGRAIN_FILTER 0
 %define CONFIG_REMOVELOGO_FILTER 0
 %define CONFIG_REPEATFIELDS_FILTER 0
@@ -1674,6 +1764,8 @@
 %define CONFIG_SAB_FILTER 0
 %define CONFIG_SCALE_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 0
+%define CONFIG_SCALE_NPP_FILTER 0
+%define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SELECT_FILTER 0
 %define CONFIG_SELECTIVECOLOR_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
@@ -1724,6 +1816,7 @@
 %define CONFIG_ALLYUV_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
+%define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 0
 %define CONFIG_LIFE_FILTER 0
@@ -1753,6 +1846,7 @@
 %define CONFIG_MOVIE_FILTER 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 0
 %define CONFIG_H264_DXVA2_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1762,6 +1856,7 @@
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 0
 %define CONFIG_HEVC_DXVA2_HWACCEL 0
 %define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1782,12 +1877,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 0
 %define CONFIG_VC1_DXVA2_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 0
+%define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 0
 %define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1850,14 +1948,17 @@
 %define CONFIG_FLAC_MUXER 0
 %define CONFIG_FLV_MUXER 0
 %define CONFIG_FRAMECRC_MUXER 0
+%define CONFIG_FRAMEHASH_MUXER 0
 %define CONFIG_FRAMEMD5_MUXER 0
 %define CONFIG_G722_MUXER 0
 %define CONFIG_G723_1_MUXER 0
 %define CONFIG_GIF_MUXER 0
+%define CONFIG_GSM_MUXER 0
 %define CONFIG_GXF_MUXER 0
 %define CONFIG_H261_MUXER 0
 %define CONFIG_H263_MUXER 0
 %define CONFIG_H264_MUXER 0
+%define CONFIG_HASH_MUXER 0
 %define CONFIG_HDS_MUXER 0
 %define CONFIG_HEVC_MUXER 0
 %define CONFIG_HLS_MUXER 0
@@ -2042,9 +2143,9 @@
 %define CONFIG_SRTP_PROTOCOL 0
 %define CONFIG_SUBFILE_PROTOCOL 0
 %define CONFIG_TCP_PROTOCOL 0
+%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 %define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_OPENSSL_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
 %define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_darwin64.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 1
 #define HAVE_RDTSC 0
 #define HAVE_SARESTART 1
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 #define HAVE_CABS 1
 #define HAVE_CEXP 1
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 0
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1
 #define HAVE_SYSCONF 1
-#define HAVE_SYSCTL 1
 #define HAVE_USLEEP 1
 #define HAVE_UTGETOSTYPEFROMSTRING 1
 #define HAVE_VIRTUALALLOC 0
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 1
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,12 +370,14 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
 #define HAVE_MAKEINFO_HTML 1
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -490,25 +495,35 @@
 #define CONFIG_SCHANNEL 0
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +595,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +624,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +653,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +728,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +754,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +822,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +841,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +887,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +918,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1026,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1039,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1072,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1098,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1105,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1122,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1167,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1241,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1344,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1363,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1521,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1540,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1554,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1582,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1625,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1659,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1705,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1724,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1736,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1768,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1779,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1831,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1861,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1871,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1892,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1963,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2158,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_unix32.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 0
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 0
 #define HAVE_RDTSC 0
 #define HAVE_SARESTART 1
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 #define HAVE_CABS 1
 #define HAVE_CEXP 1
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 1
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1
 #define HAVE_SYSCONF 1
-#define HAVE_SYSCTL 0
 #define HAVE_USLEEP 1
 #define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 0
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 1
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,12 +370,14 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 1
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -493,22 +498,31 @@
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +594,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +623,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +652,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +727,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +753,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +821,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +840,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +886,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +917,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1025,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1038,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1071,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1097,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1104,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1121,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1166,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1240,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1343,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1362,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1520,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1539,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1553,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1581,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1624,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1658,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1704,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1723,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1735,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1767,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1778,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1830,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1860,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1870,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1891,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1962,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2157,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_unix64.asm

@@ -56,6 +56,7 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
+%define HAVE_MIPS32R5 0
 %define HAVE_MIPS64R2 0
 %define HAVE_MIPS32R6 0
 %define HAVE_MIPS64R6 0
@@ -99,6 +100,7 @@
 %define HAVE_I686_EXTERNAL 0
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
+%define HAVE_MIPS32R5_EXTERNAL 0
 %define HAVE_MIPS64R2_EXTERNAL 0
 %define HAVE_MIPS32R6_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
@@ -142,6 +144,7 @@
 %define HAVE_I686_INLINE 0
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
+%define HAVE_MIPS32R5_INLINE 0
 %define HAVE_MIPS64R2_INLINE 0
 %define HAVE_MIPS32R6_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
@@ -169,6 +172,7 @@
 %define HAVE_MM_EMPTY 1
 %define HAVE_RDTSC 0
 %define HAVE_SARESTART 1
+%define HAVE_SEM_TIMEDWAIT 1
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 %define HAVE_CABS 1
 %define HAVE_CEXP 1
@@ -184,6 +188,7 @@
 %define HAVE_ASM_TYPES_H 1
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+%define HAVE_DISPATCH_DISPATCH_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 %define HAVE_DEV_IC_BT8XX_H 0
@@ -332,6 +337,7 @@
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 %define HAVE_STRUCT_POLLFD 1
 %define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 %define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -349,16 +355,18 @@
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
 %define HAVE_SDL 0
 %define HAVE_SECTION_DATA_REL_RO 1
 %define HAVE_TEXI2HTML 0
 %define HAVE_THREADS 1
+%define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
-%define HAVE_XLIB 1
+%define HAVE_XLIB 0
 %define CONFIG_BSFS 0
 %define CONFIG_DECODERS 1
 %define CONFIG_ENCODERS 0
@@ -401,6 +409,7 @@
 %define CONFIG_GMP 0
 %define CONFIG_GNUTLS 0
 %define CONFIG_ICONV 0
+%define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
 %define CONFIG_LIBASS 0
 %define CONFIG_LIBBLURAY 0
@@ -409,7 +418,7 @@
 %define CONFIG_LIBCDIO 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
-%define CONFIG_LIBDCADEC 0
+%define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
@@ -421,7 +430,6 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
 %define CONFIG_LIBKVAZAAR 0
-%define CONFIG_LIBMFX 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
 %define CONFIG_LIBNUT 0
@@ -444,7 +452,6 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 0
 %define CONFIG_LIBTWOLAME 0
-%define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBVO_AMRWBENC 0
@@ -464,9 +471,8 @@
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 0
-%define CONFIG_MMAL 0
+%define CONFIG_MEDIACODEC 0
 %define CONFIG_NETCDF 0
-%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
@@ -474,25 +480,35 @@
 %define CONFIG_SCHANNEL 0
 %define CONFIG_SDL 0
 %define CONFIG_SECURETRANSPORT 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
-%define CONFIG_XLIB 1
+%define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_AUDIOTOOLBOX 0
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
+%define CONFIG_D3D11VA 0
+%define CONFIG_DXVA2 0
+%define CONFIG_LIBMFX 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 0
+%define CONFIG_OMX 0
+%define CONFIG_VAAPI 0
+%define CONFIG_VDA 0
+%define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_XVMC 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
+%define CONFIG_OMX_RPI 0
 %define CONFIG_RUNTIME_CPUDETECT 1
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 1
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 0
 %define CONFIG_SWSCALE_ALPHA 1
-%define CONFIG_D3D11VA 0
-%define CONFIG_DXVA2 0
-%define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
-%define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX 0
-%define CONFIG_XVMC 0
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 0
@@ -564,6 +580,7 @@
 %define CONFIG_IIRFILTER 0
 %define CONFIG_IMDCT15 0
 %define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 0
 %define CONFIG_IVIDSP 0
 %define CONFIG_JPEGTABLES 0
 %define CONFIG_LGPLV3 0
@@ -592,19 +609,24 @@
 %define CONFIG_RV34DSP 0
 %define CONFIG_SINEWIN 0
 %define CONFIG_SNAPPY 0
+%define CONFIG_SRTP 0
 %define CONFIG_STARTCODE 0
 %define CONFIG_TEXTUREDSP 0
 %define CONFIG_TEXTUREDSPENC 0
 %define CONFIG_TPELDSP 0
+%define CONFIG_VAAPI_ENCODE 0
+%define CONFIG_VC1DSP 0
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 0
 %define CONFIG_VP56DSP 0
 %define CONFIG_VP8DSP 1
+%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 0
 %define CONFIG_WMV2DSP 0
 %define CONFIG_AAC_ADTSTOASC_BSF 0
 %define CONFIG_CHOMP_BSF 0
 %define CONFIG_DUMP_EXTRADATA_BSF 0
+%define CONFIG_DCA_CORE_BSF 0
 %define CONFIG_H264_MP4TOANNEXB_BSF 0
 %define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 %define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -616,6 +638,7 @@
 %define CONFIG_NOISE_BSF 0
 %define CONFIG_REMOVE_EXTRADATA_BSF 0
 %define CONFIG_TEXT2MOVSUB_BSF 0
+%define CONFIG_VP9_SUPERFRAME_BSF 0
 %define CONFIG_AASC_DECODER 0
 %define CONFIG_AIC_DECODER 0
 %define CONFIG_ALIAS_PIX_DECODER 0
@@ -690,6 +713,7 @@
 %define CONFIG_H263P_DECODER 0
 %define CONFIG_H264_DECODER 0
 %define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_MEDIACODEC_DECODER 0
 %define CONFIG_H264_MMAL_DECODER 0
 %define CONFIG_H264_QSV_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
@@ -715,6 +739,8 @@
 %define CONFIG_KMVC_DECODER 0
 %define CONFIG_LAGARITH_DECODER 0
 %define CONFIG_LOCO_DECODER 0
+%define CONFIG_M101_DECODER 0
+%define CONFIG_MAGICYUV_DECODER 0
 %define CONFIG_MDEC_DECODER 0
 %define CONFIG_MIMIC_DECODER 0
 %define CONFIG_MJPEG_DECODER 0
@@ -781,6 +807,7 @@
 %define CONFIG_SDX2_DPCM_DECODER 0
 %define CONFIG_SGI_DECODER 0
 %define CONFIG_SGIRLE_DECODER 0
+%define CONFIG_SHEERVIDEO_DECODER 0
 %define CONFIG_SMACKER_DECODER 0
 %define CONFIG_SMC_DECODER 0
 %define CONFIG_SMVJPEG_DECODER 0
@@ -799,6 +826,7 @@
 %define CONFIG_TMV_DECODER 0
 %define CONFIG_TRUEMOTION1_DECODER 0
 %define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TRUEMOTION2RT_DECODER 0
 %define CONFIG_TSCC_DECODER 0
 %define CONFIG_TSCC2_DECODER 0
 %define CONFIG_TXD_DECODER 0
@@ -844,6 +872,7 @@
 %define CONFIG_XL_DECODER 0
 %define CONFIG_XWD_DECODER 0
 %define CONFIG_Y41P_DECODER 0
+%define CONFIG_YLC_DECODER 0
 %define CONFIG_YOP_DECODER 0
 %define CONFIG_YUV4_DECODER 0
 %define CONFIG_ZERO12V_DECODER 0
@@ -874,6 +903,7 @@
 %define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 %define CONFIG_DSICINAUDIO_DECODER 0
 %define CONFIG_DSS_SP_DECODER 0
+%define CONFIG_DST_DECODER 0
 %define CONFIG_EAC3_DECODER 0
 %define CONFIG_EVRC_DECODER 0
 %define CONFIG_FFWAVESYNTH_DECODER 0
@@ -981,6 +1011,7 @@
 %define CONFIG_ADPCM_G726LE_DECODER 0
 %define CONFIG_ADPCM_IMA_AMV_DECODER 0
 %define CONFIG_ADPCM_IMA_APC_DECODER 0
+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 %define CONFIG_ADPCM_IMA_DK3_DECODER 0
 %define CONFIG_ADPCM_IMA_DK4_DECODER 0
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -993,6 +1024,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 0
 %define CONFIG_ADPCM_IMA_WS_DECODER 0
 %define CONFIG_ADPCM_MS_DECODER 0
+%define CONFIG_ADPCM_MTAF_DECODER 0
 %define CONFIG_ADPCM_PSX_DECODER 0
 %define CONFIG_ADPCM_SBPRO_2_DECODER 0
 %define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1025,8 +1057,22 @@
 %define CONFIG_VPLAYER_DECODER 0
 %define CONFIG_WEBVTT_DECODER 0
 %define CONFIG_XSUB_DECODER 0
+%define CONFIG_AAC_AT_DECODER 0
+%define CONFIG_AC3_AT_DECODER 0
+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+%define CONFIG_ALAC_AT_DECODER 0
+%define CONFIG_AMR_NB_AT_DECODER 0
+%define CONFIG_EAC3_AT_DECODER 0
+%define CONFIG_GSM_MS_AT_DECODER 0
+%define CONFIG_ILBC_AT_DECODER 0
+%define CONFIG_MP1_AT_DECODER 0
+%define CONFIG_MP2_AT_DECODER 0
+%define CONFIG_MP3_AT_DECODER 0
+%define CONFIG_PCM_ALAW_AT_DECODER 0
+%define CONFIG_PCM_MULAW_AT_DECODER 0
+%define CONFIG_QDMC_AT_DECODER 0
+%define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBDCADEC_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1037,7 +1083,6 @@
 %define CONFIG_LIBOPUS_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 0
-%define CONFIG_LIBUTVIDEO_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 0
 %define CONFIG_LIBVPX_VP8_DECODER 0
 %define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1045,6 +1090,11 @@
 %define CONFIG_BINTEXT_DECODER 0
 %define CONFIG_XBIN_DECODER 0
 %define CONFIG_IDF_DECODER 0
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_AA_DEMUXER 0
 %define CONFIG_AAC_DEMUXER 0
 %define CONFIG_AC3_DEMUXER 0
@@ -1057,6 +1107,7 @@
 %define CONFIG_AEA_DEMUXER 0
 %define CONFIG_AFC_DEMUXER 0
 %define CONFIG_AIFF_DEMUXER 0
+%define CONFIG_AIX_DEMUXER 0
 %define CONFIG_AMR_DEMUXER 0
 %define CONFIG_ANM_DEMUXER 0
 %define CONFIG_APC_DEMUXER 0
@@ -1101,6 +1152,7 @@
 %define CONFIG_DTSHD_DEMUXER 0
 %define CONFIG_DV_DEMUXER 0
 %define CONFIG_DVBSUB_DEMUXER 0
+%define CONFIG_DVBTXT_DEMUXER 0
 %define CONFIG_DXA_DEMUXER 0
 %define CONFIG_EA_DEMUXER 0
 %define CONFIG_EA_CDATA_DEMUXER 0
@@ -1174,7 +1226,9 @@
 %define CONFIG_MPSUB_DEMUXER 0
 %define CONFIG_MSF_DEMUXER 0
 %define CONFIG_MSNWC_TCP_DEMUXER 0
+%define CONFIG_MTAF_DEMUXER 0
 %define CONFIG_MTV_DEMUXER 0
+%define CONFIG_MUSX_DEMUXER 0
 %define CONFIG_MV_DEMUXER 0
 %define CONFIG_MVI_DEMUXER 0
 %define CONFIG_MXF_DEMUXER 0
@@ -1275,6 +1329,7 @@
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 %define CONFIG_WEBVTT_DEMUXER 0
 %define CONFIG_WSAUD_DEMUXER 0
+%define CONFIG_WSD_DEMUXER 0
 %define CONFIG_WSVQA_DEMUXER 0
 %define CONFIG_WTV_DEMUXER 0
 %define CONFIG_WVE_DEMUXER 0
@@ -1293,8 +1348,14 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1445,6 +1506,11 @@
 %define CONFIG_TEXT_ENCODER 0
 %define CONFIG_WEBVTT_ENCODER 0
 %define CONFIG_XSUB_ENCODER 0
+%define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_ALAC_AT_ENCODER 0
+%define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_PCM_ALAW_AT_ENCODER 0
+%define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
@@ -1459,7 +1525,6 @@
 %define CONFIG_LIBSPEEX_ENCODER 0
 %define CONFIG_LIBTHEORA_ENCODER 0
 %define CONFIG_LIBTWOLAME_ENCODER 0
-%define CONFIG_LIBUTVIDEO_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 0
 %define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1474,13 +1539,21 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 0
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 0
+%define CONFIG_H264_VAAPI_ENCODER 0
+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 0
 %define CONFIG_NVENC_HEVC_ENCODER 0
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_HEVC_QSV_ENCODER 0
+%define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 0
+%define CONFIG_ABENCH_FILTER 0
 %define CONFIG_ACOMPRESSOR_FILTER 0
 %define CONFIG_ACROSSFADE_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
@@ -1494,6 +1567,7 @@
 %define CONFIG_AINTERLEAVE_FILTER 0
 %define CONFIG_ALIMITER_FILTER 0
 %define CONFIG_ALLPASS_FILTER 0
+%define CONFIG_ALOOP_FILTER 0
 %define CONFIG_AMERGE_FILTER 0
 %define CONFIG_AMETADATA_FILTER 0
 %define CONFIG_AMIX_FILTER 0
@@ -1536,10 +1610,13 @@
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
 %define CONFIG_EXTRASTEREO_FILTER 0
+%define CONFIG_FIREQUALIZER_FILTER 0
 %define CONFIG_FLANGER_FILTER 0
+%define CONFIG_HDCD_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
+%define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 0
 %define CONFIG_PAN_FILTER 0
 %define CONFIG_REPLAYGAIN_FILTER 0
@@ -1567,24 +1644,30 @@
 %define CONFIG_ALPHAMERGE_FILTER 0
 %define CONFIG_ATADENOISE_FILTER 0
 %define CONFIG_ASS_FILTER 0
+%define CONFIG_BENCH_FILTER 0
 %define CONFIG_BBOX_FILTER 0
 %define CONFIG_BLACKDETECT_FILTER 0
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_BWDIF_FILTER 0
 %define CONFIG_CHROMAKEY_FILTER 0
+%define CONFIG_CIESCOPE_FILTER 0
 %define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORKEY_FILTER 0
 %define CONFIG_COLORLEVELS_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
+%define CONFIG_COLORSPACE_FILTER 0
 %define CONFIG_CONVOLUTION_FILTER 0
 %define CONFIG_COPY_FILTER 0
+%define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 0
 %define CONFIG_CROP_FILTER 0
 %define CONFIG_CROPDETECT_FILTER 0
 %define CONFIG_CURVES_FILTER 0
+%define CONFIG_DATASCOPE_FILTER 0
 %define CONFIG_DCTDNOIZ_FILTER 0
 %define CONFIG_DEBAND_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
@@ -1607,6 +1690,7 @@
 %define CONFIG_FADE_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
 %define CONFIG_FIELD_FILTER 0
+%define CONFIG_FIELDHINT_FILTER 0
 %define CONFIG_FIELDMATCH_FILTER 0
 %define CONFIG_FIELDORDER_FILTER 0
 %define CONFIG_FIND_RECT_FILTER 0
@@ -1625,6 +1709,9 @@
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
 %define CONFIG_HQX_FILTER 0
+%define CONFIG_HWDOWNLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
@@ -1634,6 +1721,7 @@
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
 %define CONFIG_LENSCORRECTION_FILTER 0
+%define CONFIG_LOOP_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1665,7 +1753,9 @@
 %define CONFIG_PULLUP_FILTER 0
 %define CONFIG_QP_FILTER 0
 %define CONFIG_RANDOM_FILTER 0
+%define CONFIG_READVITC_FILTER 0
 %define CONFIG_REALTIME_FILTER 0
+%define CONFIG_REMAP_FILTER 0
 %define CONFIG_REMOVEGRAIN_FILTER 0
 %define CONFIG_REMOVELOGO_FILTER 0
 %define CONFIG_REPEATFIELDS_FILTER 0
@@ -1674,6 +1764,8 @@
 %define CONFIG_SAB_FILTER 0
 %define CONFIG_SCALE_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 0
+%define CONFIG_SCALE_NPP_FILTER 0
+%define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SELECT_FILTER 0
 %define CONFIG_SELECTIVECOLOR_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
@@ -1724,6 +1816,7 @@
 %define CONFIG_ALLYUV_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
+%define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 0
 %define CONFIG_LIFE_FILTER 0
@@ -1753,6 +1846,7 @@
 %define CONFIG_MOVIE_FILTER 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 0
 %define CONFIG_H264_DXVA2_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1762,6 +1856,7 @@
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 0
 %define CONFIG_HEVC_DXVA2_HWACCEL 0
 %define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1782,12 +1877,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 0
 %define CONFIG_VC1_DXVA2_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 0
+%define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 0
 %define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1850,14 +1948,17 @@
 %define CONFIG_FLAC_MUXER 0
 %define CONFIG_FLV_MUXER 0
 %define CONFIG_FRAMECRC_MUXER 0
+%define CONFIG_FRAMEHASH_MUXER 0
 %define CONFIG_FRAMEMD5_MUXER 0
 %define CONFIG_G722_MUXER 0
 %define CONFIG_G723_1_MUXER 0
 %define CONFIG_GIF_MUXER 0
+%define CONFIG_GSM_MUXER 0
 %define CONFIG_GXF_MUXER 0
 %define CONFIG_H261_MUXER 0
 %define CONFIG_H263_MUXER 0
 %define CONFIG_H264_MUXER 0
+%define CONFIG_HASH_MUXER 0
 %define CONFIG_HDS_MUXER 0
 %define CONFIG_HEVC_MUXER 0
 %define CONFIG_HLS_MUXER 0
@@ -2042,9 +2143,9 @@
 %define CONFIG_SRTP_PROTOCOL 0
 %define CONFIG_SUBFILE_PROTOCOL 0
 %define CONFIG_TCP_PROTOCOL 0
+%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 %define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_OPENSSL_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
 %define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_unix64.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 1
 #define HAVE_RDTSC 0
 #define HAVE_SARESTART 1
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
 #define HAVE_CABS 1
 #define HAVE_CEXP 1
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 1
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1
 #define HAVE_SYSCONF 1
-#define HAVE_SYSCTL 0
 #define HAVE_USLEEP 1
 #define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 0
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 1
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,16 +370,18 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 1
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
-#define HAVE_XLIB 1
+#define HAVE_XLIB 0
 #define CONFIG_BSFS 0
 #define CONFIG_DECODERS 1
 #define CONFIG_ENCODERS 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -490,25 +495,35 @@
 #define CONFIG_SCHANNEL 0
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
-#define CONFIG_XLIB 1
+#define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +595,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +624,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +653,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +728,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +754,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +822,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +841,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +887,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +918,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1026,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1039,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1072,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1098,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1105,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1122,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1167,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1241,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1344,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1363,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1521,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1540,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1554,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1582,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1625,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1659,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1705,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1724,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1736,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1768,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1779,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1831,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1861,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1871,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1892,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1963,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2158,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_win32.asm

@@ -56,6 +56,7 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
+%define HAVE_MIPS32R5 0
 %define HAVE_MIPS64R2 0
 %define HAVE_MIPS32R6 0
 %define HAVE_MIPS64R6 0
@@ -99,6 +100,7 @@
 %define HAVE_I686_EXTERNAL 0
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
+%define HAVE_MIPS32R5_EXTERNAL 0
 %define HAVE_MIPS64R2_EXTERNAL 0
 %define HAVE_MIPS32R6_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
@@ -142,6 +144,7 @@
 %define HAVE_I686_INLINE 0
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
+%define HAVE_MIPS32R5_INLINE 0
 %define HAVE_MIPS64R2_INLINE 0
 %define HAVE_MIPS32R6_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
@@ -169,6 +172,7 @@
 %define HAVE_MM_EMPTY 1
 %define HAVE_RDTSC 1
 %define HAVE_SARESTART 0
+%define HAVE_SEM_TIMEDWAIT 1
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 %define HAVE_CABS 0
 %define HAVE_CEXP 0
@@ -184,6 +188,7 @@
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+%define HAVE_DISPATCH_DISPATCH_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 %define HAVE_DEV_IC_BT8XX_H 0
@@ -332,6 +337,7 @@
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 %define HAVE_STRUCT_POLLFD 0
 %define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 %define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -349,12 +355,14 @@
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
 %define HAVE_MAKEINFO_HTML 0
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
 %define HAVE_SDL 0
 %define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
 %define HAVE_THREADS 1
+%define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
@@ -401,6 +409,7 @@
 %define CONFIG_GMP 0
 %define CONFIG_GNUTLS 0
 %define CONFIG_ICONV 0
+%define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
 %define CONFIG_LIBASS 0
 %define CONFIG_LIBBLURAY 0
@@ -409,7 +418,7 @@
 %define CONFIG_LIBCDIO 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
-%define CONFIG_LIBDCADEC 0
+%define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
@@ -421,7 +430,6 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
 %define CONFIG_LIBKVAZAAR 0
-%define CONFIG_LIBMFX 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
 %define CONFIG_LIBNUT 0
@@ -444,7 +452,6 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 0
 %define CONFIG_LIBTWOLAME 0
-%define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBVO_AMRWBENC 0
@@ -464,9 +471,8 @@
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 0
-%define CONFIG_MMAL 0
+%define CONFIG_MEDIACODEC 0
 %define CONFIG_NETCDF 0
-%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
@@ -474,25 +480,35 @@
 %define CONFIG_SCHANNEL 1
 %define CONFIG_SDL 0
 %define CONFIG_SECURETRANSPORT 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_AUDIOTOOLBOX 0
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
+%define CONFIG_D3D11VA 0
+%define CONFIG_DXVA2 0
+%define CONFIG_LIBMFX 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 0
+%define CONFIG_OMX 0
+%define CONFIG_VAAPI 0
+%define CONFIG_VDA 0
+%define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_XVMC 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
+%define CONFIG_OMX_RPI 0
 %define CONFIG_RUNTIME_CPUDETECT 1
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 1
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 0
 %define CONFIG_SWSCALE_ALPHA 1
-%define CONFIG_D3D11VA 0
-%define CONFIG_DXVA2 0
-%define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
-%define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX 0
-%define CONFIG_XVMC 0
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 0
@@ -564,6 +580,7 @@
 %define CONFIG_IIRFILTER 0
 %define CONFIG_IMDCT15 0
 %define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 0
 %define CONFIG_IVIDSP 0
 %define CONFIG_JPEGTABLES 0
 %define CONFIG_LGPLV3 0
@@ -592,19 +609,24 @@
 %define CONFIG_RV34DSP 0
 %define CONFIG_SINEWIN 0
 %define CONFIG_SNAPPY 0
+%define CONFIG_SRTP 0
 %define CONFIG_STARTCODE 0
 %define CONFIG_TEXTUREDSP 0
 %define CONFIG_TEXTUREDSPENC 0
 %define CONFIG_TPELDSP 0
+%define CONFIG_VAAPI_ENCODE 0
+%define CONFIG_VC1DSP 0
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 0
 %define CONFIG_VP56DSP 0
 %define CONFIG_VP8DSP 1
+%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 0
 %define CONFIG_WMV2DSP 0
 %define CONFIG_AAC_ADTSTOASC_BSF 0
 %define CONFIG_CHOMP_BSF 0
 %define CONFIG_DUMP_EXTRADATA_BSF 0
+%define CONFIG_DCA_CORE_BSF 0
 %define CONFIG_H264_MP4TOANNEXB_BSF 0
 %define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 %define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -616,6 +638,7 @@
 %define CONFIG_NOISE_BSF 0
 %define CONFIG_REMOVE_EXTRADATA_BSF 0
 %define CONFIG_TEXT2MOVSUB_BSF 0
+%define CONFIG_VP9_SUPERFRAME_BSF 0
 %define CONFIG_AASC_DECODER 0
 %define CONFIG_AIC_DECODER 0
 %define CONFIG_ALIAS_PIX_DECODER 0
@@ -690,6 +713,7 @@
 %define CONFIG_H263P_DECODER 0
 %define CONFIG_H264_DECODER 0
 %define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_MEDIACODEC_DECODER 0
 %define CONFIG_H264_MMAL_DECODER 0
 %define CONFIG_H264_QSV_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
@@ -715,6 +739,8 @@
 %define CONFIG_KMVC_DECODER 0
 %define CONFIG_LAGARITH_DECODER 0
 %define CONFIG_LOCO_DECODER 0
+%define CONFIG_M101_DECODER 0
+%define CONFIG_MAGICYUV_DECODER 0
 %define CONFIG_MDEC_DECODER 0
 %define CONFIG_MIMIC_DECODER 0
 %define CONFIG_MJPEG_DECODER 0
@@ -781,6 +807,7 @@
 %define CONFIG_SDX2_DPCM_DECODER 0
 %define CONFIG_SGI_DECODER 0
 %define CONFIG_SGIRLE_DECODER 0
+%define CONFIG_SHEERVIDEO_DECODER 0
 %define CONFIG_SMACKER_DECODER 0
 %define CONFIG_SMC_DECODER 0
 %define CONFIG_SMVJPEG_DECODER 0
@@ -799,6 +826,7 @@
 %define CONFIG_TMV_DECODER 0
 %define CONFIG_TRUEMOTION1_DECODER 0
 %define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TRUEMOTION2RT_DECODER 0
 %define CONFIG_TSCC_DECODER 0
 %define CONFIG_TSCC2_DECODER 0
 %define CONFIG_TXD_DECODER 0
@@ -844,6 +872,7 @@
 %define CONFIG_XL_DECODER 0
 %define CONFIG_XWD_DECODER 0
 %define CONFIG_Y41P_DECODER 0
+%define CONFIG_YLC_DECODER 0
 %define CONFIG_YOP_DECODER 0
 %define CONFIG_YUV4_DECODER 0
 %define CONFIG_ZERO12V_DECODER 0
@@ -874,6 +903,7 @@
 %define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 %define CONFIG_DSICINAUDIO_DECODER 0
 %define CONFIG_DSS_SP_DECODER 0
+%define CONFIG_DST_DECODER 0
 %define CONFIG_EAC3_DECODER 0
 %define CONFIG_EVRC_DECODER 0
 %define CONFIG_FFWAVESYNTH_DECODER 0
@@ -981,6 +1011,7 @@
 %define CONFIG_ADPCM_G726LE_DECODER 0
 %define CONFIG_ADPCM_IMA_AMV_DECODER 0
 %define CONFIG_ADPCM_IMA_APC_DECODER 0
+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 %define CONFIG_ADPCM_IMA_DK3_DECODER 0
 %define CONFIG_ADPCM_IMA_DK4_DECODER 0
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -993,6 +1024,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 0
 %define CONFIG_ADPCM_IMA_WS_DECODER 0
 %define CONFIG_ADPCM_MS_DECODER 0
+%define CONFIG_ADPCM_MTAF_DECODER 0
 %define CONFIG_ADPCM_PSX_DECODER 0
 %define CONFIG_ADPCM_SBPRO_2_DECODER 0
 %define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1025,8 +1057,22 @@
 %define CONFIG_VPLAYER_DECODER 0
 %define CONFIG_WEBVTT_DECODER 0
 %define CONFIG_XSUB_DECODER 0
+%define CONFIG_AAC_AT_DECODER 0
+%define CONFIG_AC3_AT_DECODER 0
+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+%define CONFIG_ALAC_AT_DECODER 0
+%define CONFIG_AMR_NB_AT_DECODER 0
+%define CONFIG_EAC3_AT_DECODER 0
+%define CONFIG_GSM_MS_AT_DECODER 0
+%define CONFIG_ILBC_AT_DECODER 0
+%define CONFIG_MP1_AT_DECODER 0
+%define CONFIG_MP2_AT_DECODER 0
+%define CONFIG_MP3_AT_DECODER 0
+%define CONFIG_PCM_ALAW_AT_DECODER 0
+%define CONFIG_PCM_MULAW_AT_DECODER 0
+%define CONFIG_QDMC_AT_DECODER 0
+%define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBDCADEC_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1037,7 +1083,6 @@
 %define CONFIG_LIBOPUS_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 0
-%define CONFIG_LIBUTVIDEO_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 0
 %define CONFIG_LIBVPX_VP8_DECODER 0
 %define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1045,6 +1090,11 @@
 %define CONFIG_BINTEXT_DECODER 0
 %define CONFIG_XBIN_DECODER 0
 %define CONFIG_IDF_DECODER 0
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_AA_DEMUXER 0
 %define CONFIG_AAC_DEMUXER 0
 %define CONFIG_AC3_DEMUXER 0
@@ -1057,6 +1107,7 @@
 %define CONFIG_AEA_DEMUXER 0
 %define CONFIG_AFC_DEMUXER 0
 %define CONFIG_AIFF_DEMUXER 0
+%define CONFIG_AIX_DEMUXER 0
 %define CONFIG_AMR_DEMUXER 0
 %define CONFIG_ANM_DEMUXER 0
 %define CONFIG_APC_DEMUXER 0
@@ -1101,6 +1152,7 @@
 %define CONFIG_DTSHD_DEMUXER 0
 %define CONFIG_DV_DEMUXER 0
 %define CONFIG_DVBSUB_DEMUXER 0
+%define CONFIG_DVBTXT_DEMUXER 0
 %define CONFIG_DXA_DEMUXER 0
 %define CONFIG_EA_DEMUXER 0
 %define CONFIG_EA_CDATA_DEMUXER 0
@@ -1174,7 +1226,9 @@
 %define CONFIG_MPSUB_DEMUXER 0
 %define CONFIG_MSF_DEMUXER 0
 %define CONFIG_MSNWC_TCP_DEMUXER 0
+%define CONFIG_MTAF_DEMUXER 0
 %define CONFIG_MTV_DEMUXER 0
+%define CONFIG_MUSX_DEMUXER 0
 %define CONFIG_MV_DEMUXER 0
 %define CONFIG_MVI_DEMUXER 0
 %define CONFIG_MXF_DEMUXER 0
@@ -1275,6 +1329,7 @@
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 %define CONFIG_WEBVTT_DEMUXER 0
 %define CONFIG_WSAUD_DEMUXER 0
+%define CONFIG_WSD_DEMUXER 0
 %define CONFIG_WSVQA_DEMUXER 0
 %define CONFIG_WTV_DEMUXER 0
 %define CONFIG_WVE_DEMUXER 0
@@ -1293,8 +1348,14 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1445,6 +1506,11 @@
 %define CONFIG_TEXT_ENCODER 0
 %define CONFIG_WEBVTT_ENCODER 0
 %define CONFIG_XSUB_ENCODER 0
+%define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_ALAC_AT_ENCODER 0
+%define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_PCM_ALAW_AT_ENCODER 0
+%define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
@@ -1459,7 +1525,6 @@
 %define CONFIG_LIBSPEEX_ENCODER 0
 %define CONFIG_LIBTHEORA_ENCODER 0
 %define CONFIG_LIBTWOLAME_ENCODER 0
-%define CONFIG_LIBUTVIDEO_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 0
 %define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1474,13 +1539,21 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 0
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 0
+%define CONFIG_H264_VAAPI_ENCODER 0
+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 0
 %define CONFIG_NVENC_HEVC_ENCODER 0
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_HEVC_QSV_ENCODER 0
+%define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 0
+%define CONFIG_ABENCH_FILTER 0
 %define CONFIG_ACOMPRESSOR_FILTER 0
 %define CONFIG_ACROSSFADE_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
@@ -1494,6 +1567,7 @@
 %define CONFIG_AINTERLEAVE_FILTER 0
 %define CONFIG_ALIMITER_FILTER 0
 %define CONFIG_ALLPASS_FILTER 0
+%define CONFIG_ALOOP_FILTER 0
 %define CONFIG_AMERGE_FILTER 0
 %define CONFIG_AMETADATA_FILTER 0
 %define CONFIG_AMIX_FILTER 0
@@ -1536,10 +1610,13 @@
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
 %define CONFIG_EXTRASTEREO_FILTER 0
+%define CONFIG_FIREQUALIZER_FILTER 0
 %define CONFIG_FLANGER_FILTER 0
+%define CONFIG_HDCD_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
+%define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 0
 %define CONFIG_PAN_FILTER 0
 %define CONFIG_REPLAYGAIN_FILTER 0
@@ -1567,24 +1644,30 @@
 %define CONFIG_ALPHAMERGE_FILTER 0
 %define CONFIG_ATADENOISE_FILTER 0
 %define CONFIG_ASS_FILTER 0
+%define CONFIG_BENCH_FILTER 0
 %define CONFIG_BBOX_FILTER 0
 %define CONFIG_BLACKDETECT_FILTER 0
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_BWDIF_FILTER 0
 %define CONFIG_CHROMAKEY_FILTER 0
+%define CONFIG_CIESCOPE_FILTER 0
 %define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORKEY_FILTER 0
 %define CONFIG_COLORLEVELS_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
+%define CONFIG_COLORSPACE_FILTER 0
 %define CONFIG_CONVOLUTION_FILTER 0
 %define CONFIG_COPY_FILTER 0
+%define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 0
 %define CONFIG_CROP_FILTER 0
 %define CONFIG_CROPDETECT_FILTER 0
 %define CONFIG_CURVES_FILTER 0
+%define CONFIG_DATASCOPE_FILTER 0
 %define CONFIG_DCTDNOIZ_FILTER 0
 %define CONFIG_DEBAND_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
@@ -1607,6 +1690,7 @@
 %define CONFIG_FADE_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
 %define CONFIG_FIELD_FILTER 0
+%define CONFIG_FIELDHINT_FILTER 0
 %define CONFIG_FIELDMATCH_FILTER 0
 %define CONFIG_FIELDORDER_FILTER 0
 %define CONFIG_FIND_RECT_FILTER 0
@@ -1625,6 +1709,9 @@
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
 %define CONFIG_HQX_FILTER 0
+%define CONFIG_HWDOWNLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
@@ -1634,6 +1721,7 @@
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
 %define CONFIG_LENSCORRECTION_FILTER 0
+%define CONFIG_LOOP_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1665,7 +1753,9 @@
 %define CONFIG_PULLUP_FILTER 0
 %define CONFIG_QP_FILTER 0
 %define CONFIG_RANDOM_FILTER 0
+%define CONFIG_READVITC_FILTER 0
 %define CONFIG_REALTIME_FILTER 0
+%define CONFIG_REMAP_FILTER 0
 %define CONFIG_REMOVEGRAIN_FILTER 0
 %define CONFIG_REMOVELOGO_FILTER 0
 %define CONFIG_REPEATFIELDS_FILTER 0
@@ -1674,6 +1764,8 @@
 %define CONFIG_SAB_FILTER 0
 %define CONFIG_SCALE_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 0
+%define CONFIG_SCALE_NPP_FILTER 0
+%define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SELECT_FILTER 0
 %define CONFIG_SELECTIVECOLOR_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
@@ -1724,6 +1816,7 @@
 %define CONFIG_ALLYUV_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
+%define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 0
 %define CONFIG_LIFE_FILTER 0
@@ -1753,6 +1846,7 @@
 %define CONFIG_MOVIE_FILTER 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 0
 %define CONFIG_H264_DXVA2_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1762,6 +1856,7 @@
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 0
 %define CONFIG_HEVC_DXVA2_HWACCEL 0
 %define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1782,12 +1877,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 0
 %define CONFIG_VC1_DXVA2_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 0
+%define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 0
 %define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1850,14 +1948,17 @@
 %define CONFIG_FLAC_MUXER 0
 %define CONFIG_FLV_MUXER 0
 %define CONFIG_FRAMECRC_MUXER 0
+%define CONFIG_FRAMEHASH_MUXER 0
 %define CONFIG_FRAMEMD5_MUXER 0
 %define CONFIG_G722_MUXER 0
 %define CONFIG_G723_1_MUXER 0
 %define CONFIG_GIF_MUXER 0
+%define CONFIG_GSM_MUXER 0
 %define CONFIG_GXF_MUXER 0
 %define CONFIG_H261_MUXER 0
 %define CONFIG_H263_MUXER 0
 %define CONFIG_H264_MUXER 0
+%define CONFIG_HASH_MUXER 0
 %define CONFIG_HDS_MUXER 0
 %define CONFIG_HEVC_MUXER 0
 %define CONFIG_HLS_MUXER 0
@@ -2042,9 +2143,9 @@
 %define CONFIG_SRTP_PROTOCOL 0
 %define CONFIG_SUBFILE_PROTOCOL 0
 %define CONFIG_TCP_PROTOCOL 0
+%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 %define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_OPENSSL_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
 %define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_win32.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 1
 #define HAVE_RDTSC 1
 #define HAVE_SARESTART 0
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 #define HAVE_CABS 0
 #define HAVE_CEXP 0
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 0
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 1
 #define HAVE_STRERROR_R 0
 #define HAVE_SYSCONF 0
-#define HAVE_SYSCTL 0
 #define HAVE_USLEEP 0
 #define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 1
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 0
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,12 +370,14 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
 #define HAVE_MAKEINFO_HTML 0
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -490,25 +495,35 @@
 #define CONFIG_SCHANNEL 1
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +595,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +624,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +653,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +728,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +754,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +822,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +841,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +887,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +918,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1026,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1039,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1072,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1098,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1105,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1122,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1167,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1241,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1344,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1363,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1521,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1540,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1554,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1582,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1625,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1659,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1705,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1724,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1736,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1768,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1779,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1831,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1861,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1871,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1892,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1963,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2158,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_win64.asm

@@ -56,6 +56,7 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
+%define HAVE_MIPS32R5 0
 %define HAVE_MIPS64R2 0
 %define HAVE_MIPS32R6 0
 %define HAVE_MIPS64R6 0
@@ -99,6 +100,7 @@
 %define HAVE_I686_EXTERNAL 0
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
+%define HAVE_MIPS32R5_EXTERNAL 0
 %define HAVE_MIPS64R2_EXTERNAL 0
 %define HAVE_MIPS32R6_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
@@ -142,6 +144,7 @@
 %define HAVE_I686_INLINE 0
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
+%define HAVE_MIPS32R5_INLINE 0
 %define HAVE_MIPS64R2_INLINE 0
 %define HAVE_MIPS32R6_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
@@ -169,6 +172,7 @@
 %define HAVE_MM_EMPTY 0
 %define HAVE_RDTSC 1
 %define HAVE_SARESTART 0
+%define HAVE_SEM_TIMEDWAIT 1
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 %define HAVE_CABS 0
 %define HAVE_CEXP 0
@@ -184,6 +188,7 @@
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+%define HAVE_DISPATCH_DISPATCH_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 %define HAVE_DEV_IC_BT8XX_H 0
@@ -332,6 +337,7 @@
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 %define HAVE_STRUCT_POLLFD 0
 %define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 %define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -349,12 +355,14 @@
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
 %define HAVE_MAKEINFO_HTML 0
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
 %define HAVE_SDL 0
 %define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
 %define HAVE_THREADS 1
+%define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
@@ -401,6 +409,7 @@
 %define CONFIG_GMP 0
 %define CONFIG_GNUTLS 0
 %define CONFIG_ICONV 0
+%define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
 %define CONFIG_LIBASS 0
 %define CONFIG_LIBBLURAY 0
@@ -409,7 +418,7 @@
 %define CONFIG_LIBCDIO 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
-%define CONFIG_LIBDCADEC 0
+%define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
@@ -421,7 +430,6 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
 %define CONFIG_LIBKVAZAAR 0
-%define CONFIG_LIBMFX 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
 %define CONFIG_LIBNUT 0
@@ -444,7 +452,6 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 0
 %define CONFIG_LIBTWOLAME 0
-%define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBVO_AMRWBENC 0
@@ -464,9 +471,8 @@
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 0
-%define CONFIG_MMAL 0
+%define CONFIG_MEDIACODEC 0
 %define CONFIG_NETCDF 0
-%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
@@ -474,25 +480,35 @@
 %define CONFIG_SCHANNEL 1
 %define CONFIG_SDL 0
 %define CONFIG_SECURETRANSPORT 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_AUDIOTOOLBOX 0
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
+%define CONFIG_D3D11VA 0
+%define CONFIG_DXVA2 0
+%define CONFIG_LIBMFX 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 0
+%define CONFIG_OMX 0
+%define CONFIG_VAAPI 0
+%define CONFIG_VDA 0
+%define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_XVMC 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
+%define CONFIG_OMX_RPI 0
 %define CONFIG_RUNTIME_CPUDETECT 1
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 1
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 0
 %define CONFIG_SWSCALE_ALPHA 1
-%define CONFIG_D3D11VA 0
-%define CONFIG_DXVA2 0
-%define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
-%define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX 0
-%define CONFIG_XVMC 0
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 0
@@ -564,6 +580,7 @@
 %define CONFIG_IIRFILTER 0
 %define CONFIG_IMDCT15 0
 %define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 0
 %define CONFIG_IVIDSP 0
 %define CONFIG_JPEGTABLES 0
 %define CONFIG_LGPLV3 0
@@ -592,19 +609,24 @@
 %define CONFIG_RV34DSP 0
 %define CONFIG_SINEWIN 0
 %define CONFIG_SNAPPY 0
+%define CONFIG_SRTP 0
 %define CONFIG_STARTCODE 0
 %define CONFIG_TEXTUREDSP 0
 %define CONFIG_TEXTUREDSPENC 0
 %define CONFIG_TPELDSP 0
+%define CONFIG_VAAPI_ENCODE 0
+%define CONFIG_VC1DSP 0
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 0
 %define CONFIG_VP56DSP 0
 %define CONFIG_VP8DSP 1
+%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 0
 %define CONFIG_WMV2DSP 0
 %define CONFIG_AAC_ADTSTOASC_BSF 0
 %define CONFIG_CHOMP_BSF 0
 %define CONFIG_DUMP_EXTRADATA_BSF 0
+%define CONFIG_DCA_CORE_BSF 0
 %define CONFIG_H264_MP4TOANNEXB_BSF 0
 %define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 %define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -616,6 +638,7 @@
 %define CONFIG_NOISE_BSF 0
 %define CONFIG_REMOVE_EXTRADATA_BSF 0
 %define CONFIG_TEXT2MOVSUB_BSF 0
+%define CONFIG_VP9_SUPERFRAME_BSF 0
 %define CONFIG_AASC_DECODER 0
 %define CONFIG_AIC_DECODER 0
 %define CONFIG_ALIAS_PIX_DECODER 0
@@ -690,6 +713,7 @@
 %define CONFIG_H263P_DECODER 0
 %define CONFIG_H264_DECODER 0
 %define CONFIG_H264_CRYSTALHD_DECODER 0
+%define CONFIG_H264_MEDIACODEC_DECODER 0
 %define CONFIG_H264_MMAL_DECODER 0
 %define CONFIG_H264_QSV_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
@@ -715,6 +739,8 @@
 %define CONFIG_KMVC_DECODER 0
 %define CONFIG_LAGARITH_DECODER 0
 %define CONFIG_LOCO_DECODER 0
+%define CONFIG_M101_DECODER 0
+%define CONFIG_MAGICYUV_DECODER 0
 %define CONFIG_MDEC_DECODER 0
 %define CONFIG_MIMIC_DECODER 0
 %define CONFIG_MJPEG_DECODER 0
@@ -781,6 +807,7 @@
 %define CONFIG_SDX2_DPCM_DECODER 0
 %define CONFIG_SGI_DECODER 0
 %define CONFIG_SGIRLE_DECODER 0
+%define CONFIG_SHEERVIDEO_DECODER 0
 %define CONFIG_SMACKER_DECODER 0
 %define CONFIG_SMC_DECODER 0
 %define CONFIG_SMVJPEG_DECODER 0
@@ -799,6 +826,7 @@
 %define CONFIG_TMV_DECODER 0
 %define CONFIG_TRUEMOTION1_DECODER 0
 %define CONFIG_TRUEMOTION2_DECODER 0
+%define CONFIG_TRUEMOTION2RT_DECODER 0
 %define CONFIG_TSCC_DECODER 0
 %define CONFIG_TSCC2_DECODER 0
 %define CONFIG_TXD_DECODER 0
@@ -844,6 +872,7 @@
 %define CONFIG_XL_DECODER 0
 %define CONFIG_XWD_DECODER 0
 %define CONFIG_Y41P_DECODER 0
+%define CONFIG_YLC_DECODER 0
 %define CONFIG_YOP_DECODER 0
 %define CONFIG_YUV4_DECODER 0
 %define CONFIG_ZERO12V_DECODER 0
@@ -874,6 +903,7 @@
 %define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 %define CONFIG_DSICINAUDIO_DECODER 0
 %define CONFIG_DSS_SP_DECODER 0
+%define CONFIG_DST_DECODER 0
 %define CONFIG_EAC3_DECODER 0
 %define CONFIG_EVRC_DECODER 0
 %define CONFIG_FFWAVESYNTH_DECODER 0
@@ -981,6 +1011,7 @@
 %define CONFIG_ADPCM_G726LE_DECODER 0
 %define CONFIG_ADPCM_IMA_AMV_DECODER 0
 %define CONFIG_ADPCM_IMA_APC_DECODER 0
+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 %define CONFIG_ADPCM_IMA_DK3_DECODER 0
 %define CONFIG_ADPCM_IMA_DK4_DECODER 0
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -993,6 +1024,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 0
 %define CONFIG_ADPCM_IMA_WS_DECODER 0
 %define CONFIG_ADPCM_MS_DECODER 0
+%define CONFIG_ADPCM_MTAF_DECODER 0
 %define CONFIG_ADPCM_PSX_DECODER 0
 %define CONFIG_ADPCM_SBPRO_2_DECODER 0
 %define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1025,8 +1057,22 @@
 %define CONFIG_VPLAYER_DECODER 0
 %define CONFIG_WEBVTT_DECODER 0
 %define CONFIG_XSUB_DECODER 0
+%define CONFIG_AAC_AT_DECODER 0
+%define CONFIG_AC3_AT_DECODER 0
+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+%define CONFIG_ALAC_AT_DECODER 0
+%define CONFIG_AMR_NB_AT_DECODER 0
+%define CONFIG_EAC3_AT_DECODER 0
+%define CONFIG_GSM_MS_AT_DECODER 0
+%define CONFIG_ILBC_AT_DECODER 0
+%define CONFIG_MP1_AT_DECODER 0
+%define CONFIG_MP2_AT_DECODER 0
+%define CONFIG_MP3_AT_DECODER 0
+%define CONFIG_PCM_ALAW_AT_DECODER 0
+%define CONFIG_PCM_MULAW_AT_DECODER 0
+%define CONFIG_QDMC_AT_DECODER 0
+%define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBDCADEC_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1037,7 +1083,6 @@
 %define CONFIG_LIBOPUS_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 0
-%define CONFIG_LIBUTVIDEO_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 0
 %define CONFIG_LIBVPX_VP8_DECODER 0
 %define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1045,6 +1090,11 @@
 %define CONFIG_BINTEXT_DECODER 0
 %define CONFIG_XBIN_DECODER 0
 %define CONFIG_IDF_DECODER 0
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_AA_DEMUXER 0
 %define CONFIG_AAC_DEMUXER 0
 %define CONFIG_AC3_DEMUXER 0
@@ -1057,6 +1107,7 @@
 %define CONFIG_AEA_DEMUXER 0
 %define CONFIG_AFC_DEMUXER 0
 %define CONFIG_AIFF_DEMUXER 0
+%define CONFIG_AIX_DEMUXER 0
 %define CONFIG_AMR_DEMUXER 0
 %define CONFIG_ANM_DEMUXER 0
 %define CONFIG_APC_DEMUXER 0
@@ -1101,6 +1152,7 @@
 %define CONFIG_DTSHD_DEMUXER 0
 %define CONFIG_DV_DEMUXER 0
 %define CONFIG_DVBSUB_DEMUXER 0
+%define CONFIG_DVBTXT_DEMUXER 0
 %define CONFIG_DXA_DEMUXER 0
 %define CONFIG_EA_DEMUXER 0
 %define CONFIG_EA_CDATA_DEMUXER 0
@@ -1174,7 +1226,9 @@
 %define CONFIG_MPSUB_DEMUXER 0
 %define CONFIG_MSF_DEMUXER 0
 %define CONFIG_MSNWC_TCP_DEMUXER 0
+%define CONFIG_MTAF_DEMUXER 0
 %define CONFIG_MTV_DEMUXER 0
+%define CONFIG_MUSX_DEMUXER 0
 %define CONFIG_MV_DEMUXER 0
 %define CONFIG_MVI_DEMUXER 0
 %define CONFIG_MXF_DEMUXER 0
@@ -1275,6 +1329,7 @@
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 %define CONFIG_WEBVTT_DEMUXER 0
 %define CONFIG_WSAUD_DEMUXER 0
+%define CONFIG_WSD_DEMUXER 0
 %define CONFIG_WSVQA_DEMUXER 0
 %define CONFIG_WTV_DEMUXER 0
 %define CONFIG_WVE_DEMUXER 0
@@ -1293,8 +1348,14 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1445,6 +1506,11 @@
 %define CONFIG_TEXT_ENCODER 0
 %define CONFIG_WEBVTT_ENCODER 0
 %define CONFIG_XSUB_ENCODER 0
+%define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_ALAC_AT_ENCODER 0
+%define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_PCM_ALAW_AT_ENCODER 0
+%define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
@@ -1459,7 +1525,6 @@
 %define CONFIG_LIBSPEEX_ENCODER 0
 %define CONFIG_LIBTHEORA_ENCODER 0
 %define CONFIG_LIBTWOLAME_ENCODER 0
-%define CONFIG_LIBUTVIDEO_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 0
 %define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1474,13 +1539,21 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 0
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 0
+%define CONFIG_H264_VAAPI_ENCODER 0
+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 0
 %define CONFIG_NVENC_HEVC_ENCODER 0
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_HEVC_QSV_ENCODER 0
+%define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 0
+%define CONFIG_ABENCH_FILTER 0
 %define CONFIG_ACOMPRESSOR_FILTER 0
 %define CONFIG_ACROSSFADE_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
@@ -1494,6 +1567,7 @@
 %define CONFIG_AINTERLEAVE_FILTER 0
 %define CONFIG_ALIMITER_FILTER 0
 %define CONFIG_ALLPASS_FILTER 0
+%define CONFIG_ALOOP_FILTER 0
 %define CONFIG_AMERGE_FILTER 0
 %define CONFIG_AMETADATA_FILTER 0
 %define CONFIG_AMIX_FILTER 0
@@ -1536,10 +1610,13 @@
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
 %define CONFIG_EXTRASTEREO_FILTER 0
+%define CONFIG_FIREQUALIZER_FILTER 0
 %define CONFIG_FLANGER_FILTER 0
+%define CONFIG_HDCD_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
+%define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 0
 %define CONFIG_PAN_FILTER 0
 %define CONFIG_REPLAYGAIN_FILTER 0
@@ -1567,24 +1644,30 @@
 %define CONFIG_ALPHAMERGE_FILTER 0
 %define CONFIG_ATADENOISE_FILTER 0
 %define CONFIG_ASS_FILTER 0
+%define CONFIG_BENCH_FILTER 0
 %define CONFIG_BBOX_FILTER 0
 %define CONFIG_BLACKDETECT_FILTER 0
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_BWDIF_FILTER 0
 %define CONFIG_CHROMAKEY_FILTER 0
+%define CONFIG_CIESCOPE_FILTER 0
 %define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORKEY_FILTER 0
 %define CONFIG_COLORLEVELS_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
+%define CONFIG_COLORSPACE_FILTER 0
 %define CONFIG_CONVOLUTION_FILTER 0
 %define CONFIG_COPY_FILTER 0
+%define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 0
 %define CONFIG_CROP_FILTER 0
 %define CONFIG_CROPDETECT_FILTER 0
 %define CONFIG_CURVES_FILTER 0
+%define CONFIG_DATASCOPE_FILTER 0
 %define CONFIG_DCTDNOIZ_FILTER 0
 %define CONFIG_DEBAND_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
@@ -1607,6 +1690,7 @@
 %define CONFIG_FADE_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
 %define CONFIG_FIELD_FILTER 0
+%define CONFIG_FIELDHINT_FILTER 0
 %define CONFIG_FIELDMATCH_FILTER 0
 %define CONFIG_FIELDORDER_FILTER 0
 %define CONFIG_FIND_RECT_FILTER 0
@@ -1625,6 +1709,9 @@
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
 %define CONFIG_HQX_FILTER 0
+%define CONFIG_HWDOWNLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_FILTER 0
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
@@ -1634,6 +1721,7 @@
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
 %define CONFIG_LENSCORRECTION_FILTER 0
+%define CONFIG_LOOP_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1665,7 +1753,9 @@
 %define CONFIG_PULLUP_FILTER 0
 %define CONFIG_QP_FILTER 0
 %define CONFIG_RANDOM_FILTER 0
+%define CONFIG_READVITC_FILTER 0
 %define CONFIG_REALTIME_FILTER 0
+%define CONFIG_REMAP_FILTER 0
 %define CONFIG_REMOVEGRAIN_FILTER 0
 %define CONFIG_REMOVELOGO_FILTER 0
 %define CONFIG_REPEATFIELDS_FILTER 0
@@ -1674,6 +1764,8 @@
 %define CONFIG_SAB_FILTER 0
 %define CONFIG_SCALE_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 0
+%define CONFIG_SCALE_NPP_FILTER 0
+%define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SELECT_FILTER 0
 %define CONFIG_SELECTIVECOLOR_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
@@ -1724,6 +1816,7 @@
 %define CONFIG_ALLYUV_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
+%define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 0
 %define CONFIG_LIFE_FILTER 0
@@ -1753,6 +1846,7 @@
 %define CONFIG_MOVIE_FILTER 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 0
 %define CONFIG_H264_DXVA2_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1762,6 +1856,7 @@
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 0
 %define CONFIG_HEVC_DXVA2_HWACCEL 0
 %define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1782,12 +1877,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 0
 %define CONFIG_VC1_DXVA2_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 0
+%define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 0
 %define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1850,14 +1948,17 @@
 %define CONFIG_FLAC_MUXER 0
 %define CONFIG_FLV_MUXER 0
 %define CONFIG_FRAMECRC_MUXER 0
+%define CONFIG_FRAMEHASH_MUXER 0
 %define CONFIG_FRAMEMD5_MUXER 0
 %define CONFIG_G722_MUXER 0
 %define CONFIG_G723_1_MUXER 0
 %define CONFIG_GIF_MUXER 0
+%define CONFIG_GSM_MUXER 0
 %define CONFIG_GXF_MUXER 0
 %define CONFIG_H261_MUXER 0
 %define CONFIG_H263_MUXER 0
 %define CONFIG_H264_MUXER 0
+%define CONFIG_HASH_MUXER 0
 %define CONFIG_HDS_MUXER 0
 %define CONFIG_HEVC_MUXER 0
 %define CONFIG_HLS_MUXER 0
@@ -2042,9 +2143,9 @@
 %define CONFIG_SRTP_PROTOCOL 0
 %define CONFIG_SUBFILE_PROTOCOL 0
 %define CONFIG_TCP_PROTOCOL 0
+%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 %define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-%define CONFIG_TLS_GNUTLS_PROTOCOL 0
 %define CONFIG_TLS_OPENSSL_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
 %define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/config_win64.h

@@ -72,6 +72,7 @@
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS32R5 0
 #define HAVE_MIPS64R2 0
 #define HAVE_MIPS32R6 0
 #define HAVE_MIPS64R6 0
@@ -115,6 +116,7 @@
 #define HAVE_I686_EXTERNAL 0
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS32R5_EXTERNAL 0
 #define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS32R6_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
@@ -158,6 +160,7 @@
 #define HAVE_I686_INLINE 0
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS32R5_INLINE 0
 #define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS32R6_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
@@ -185,6 +188,7 @@
 #define HAVE_MM_EMPTY 0
 #define HAVE_RDTSC 1
 #define HAVE_SARESTART 0
+#define HAVE_SEM_TIMEDWAIT 1
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 #define HAVE_CABS 0
 #define HAVE_CEXP 0
@@ -200,6 +204,7 @@
 #define HAVE_ASM_TYPES_H 0
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+#define HAVE_DISPATCH_DISPATCH_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -313,7 +318,6 @@
 #define HAVE_SLEEP 1
 #define HAVE_STRERROR_R 0
 #define HAVE_SYSCONF 0
-#define HAVE_SYSCTL 0
 #define HAVE_USLEEP 0
 #define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 1
@@ -348,6 +352,7 @@
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 #define HAVE_STRUCT_IP_MREQ_SOURCE 1
 #define HAVE_STRUCT_IPV6_MREQ 1
+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 1
 #define HAVE_STRUCT_POLLFD 0
 #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
@@ -365,12 +370,14 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
 #define HAVE_MAKEINFO_HTML 0
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SDL 0
 #define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -417,6 +424,7 @@
 #define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
+#define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
@@ -425,7 +433,7 @@
 #define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
@@ -437,7 +445,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
@@ -460,7 +467,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -480,9 +486,8 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
-#define CONFIG_MMAL 0
+#define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
@@ -490,25 +495,35 @@
 #define CONFIG_SCHANNEL 1
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 0
+#define CONFIG_DXVA2 0
+#define CONFIG_LIBMFX 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 0
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
 #define CONFIG_STATIC 0
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_D3D11VA 0
-#define CONFIG_DXVA2 0
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 0
@@ -580,6 +595,7 @@
 #define CONFIG_IIRFILTER 0
 #define CONFIG_IMDCT15 0
 #define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 0
 #define CONFIG_IVIDSP 0
 #define CONFIG_JPEGTABLES 0
 #define CONFIG_LGPLV3 0
@@ -608,19 +624,24 @@
 #define CONFIG_RV34DSP 0
 #define CONFIG_SINEWIN 0
 #define CONFIG_SNAPPY 0
+#define CONFIG_SRTP 0
 #define CONFIG_STARTCODE 0
 #define CONFIG_TEXTUREDSP 0
 #define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 0
+#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 0
 #define CONFIG_VP56DSP 0
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 0
 #define CONFIG_WMV2DSP 0
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_DCA_CORE_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
@@ -632,6 +653,7 @@
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VP9_SUPERFRAME_BSF 0
 #define CONFIG_AASC_DECODER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_ALIAS_PIX_DECODER 0
@@ -706,6 +728,7 @@
 #define CONFIG_H263P_DECODER 0
 #define CONFIG_H264_DECODER 0
 #define CONFIG_H264_CRYSTALHD_DECODER 0
+#define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
@@ -731,6 +754,8 @@
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LAGARITH_DECODER 0
 #define CONFIG_LOCO_DECODER 0
+#define CONFIG_M101_DECODER 0
+#define CONFIG_MAGICYUV_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
 #define CONFIG_MJPEG_DECODER 0
@@ -797,6 +822,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 0
 #define CONFIG_SGI_DECODER 0
 #define CONFIG_SGIRLE_DECODER 0
+#define CONFIG_SHEERVIDEO_DECODER 0
 #define CONFIG_SMACKER_DECODER 0
 #define CONFIG_SMC_DECODER 0
 #define CONFIG_SMVJPEG_DECODER 0
@@ -815,6 +841,7 @@
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TRUEMOTION1_DECODER 0
 #define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TRUEMOTION2RT_DECODER 0
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TSCC2_DECODER 0
 #define CONFIG_TXD_DECODER 0
@@ -860,6 +887,7 @@
 #define CONFIG_XL_DECODER 0
 #define CONFIG_XWD_DECODER 0
 #define CONFIG_Y41P_DECODER 0
+#define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0
 #define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZERO12V_DECODER 0
@@ -890,6 +918,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_DSS_SP_DECODER 0
+#define CONFIG_DST_DECODER 0
 #define CONFIG_EAC3_DECODER 0
 #define CONFIG_EVRC_DECODER 0
 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -997,6 +1026,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
 #define CONFIG_ADPCM_IMA_APC_DECODER 0
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -1009,6 +1039,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 0
 #define CONFIG_ADPCM_IMA_WS_DECODER 0
 #define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_MTAF_DECODER 0
 #define CONFIG_ADPCM_PSX_DECODER 0
 #define CONFIG_ADPCM_SBPRO_2_DECODER 0
 #define CONFIG_ADPCM_SBPRO_3_DECODER 0
@@ -1041,8 +1072,22 @@
 #define CONFIG_VPLAYER_DECODER 0
 #define CONFIG_WEBVTT_DECODER 0
 #define CONFIG_XSUB_DECODER 0
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1053,7 +1098,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1061,6 +1105,11 @@
 #define CONFIG_BINTEXT_DECODER 0
 #define CONFIG_XBIN_DECODER 0
 #define CONFIG_IDF_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
@@ -1073,6 +1122,7 @@
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AFC_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AIX_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
@@ -1117,6 +1167,7 @@
 #define CONFIG_DTSHD_DEMUXER 0
 #define CONFIG_DV_DEMUXER 0
 #define CONFIG_DVBSUB_DEMUXER 0
+#define CONFIG_DVBTXT_DEMUXER 0
 #define CONFIG_DXA_DEMUXER 0
 #define CONFIG_EA_DEMUXER 0
 #define CONFIG_EA_CDATA_DEMUXER 0
@@ -1190,7 +1241,9 @@
 #define CONFIG_MPSUB_DEMUXER 0
 #define CONFIG_MSF_DEMUXER 0
 #define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTAF_DEMUXER 0
 #define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MUSX_DEMUXER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
 #define CONFIG_MXF_DEMUXER 0
@@ -1291,6 +1344,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
 #define CONFIG_WEBVTT_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WVE_DEMUXER 0
@@ -1309,8 +1363,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
@@ -1461,6 +1521,11 @@
 #define CONFIG_TEXT_ENCODER 0
 #define CONFIG_WEBVTT_ENCODER 0
 #define CONFIG_XSUB_ENCODER 0
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1475,7 +1540,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -1490,13 +1554,21 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
+#define CONFIG_H264_VAAPI_ENCODER 0
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ABENCH_FILTER 0
 #define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
@@ -1510,6 +1582,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
+#define CONFIG_ALOOP_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
@@ -1552,10 +1625,13 @@
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EXTRASTEREO_FILTER 0
+#define CONFIG_FIREQUALIZER_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
+#define CONFIG_HDCD_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
@@ -1583,24 +1659,30 @@
 #define CONFIG_ALPHAMERGE_FILTER 0
 #define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
+#define CONFIG_BENCH_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BWDIF_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
+#define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_COLORSPACE_FILTER 0
 #define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
+#define CONFIG_DATASCOPE_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
@@ -1623,6 +1705,7 @@
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FIELD_FILTER 0
+#define CONFIG_FIELDHINT_FILTER 0
 #define CONFIG_FIELDMATCH_FILTER 0
 #define CONFIG_FIELDORDER_FILTER 0
 #define CONFIG_FIND_RECT_FILTER 0
@@ -1641,6 +1724,9 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HWDOWNLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
@@ -1650,6 +1736,7 @@
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LOOP_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1681,7 +1768,9 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_READVITC_FILTER 0
 #define CONFIG_REALTIME_FILTER 0
+#define CONFIG_REMAP_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -1690,6 +1779,8 @@
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
@@ -1740,6 +1831,7 @@
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 0
 #define CONFIG_LIFE_FILTER 0
@@ -1769,6 +1861,7 @@
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1778,6 +1871,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 0
@@ -1798,12 +1892,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
@@ -1866,14 +1963,17 @@
 #define CONFIG_FLAC_MUXER 0
 #define CONFIG_FLV_MUXER 0
 #define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEHASH_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
 #define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GSM_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
 #define CONFIG_H263_MUXER 0
 #define CONFIG_H264_MUXER 0
+#define CONFIG_HASH_MUXER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEVC_MUXER 0
 #define CONFIG_HLS_MUXER 0
@@ -2058,9 +2158,9 @@
 #define CONFIG_SRTP_PROTOCOL 0
 #define CONFIG_SUBFILE_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
 #define CONFIG_UDPLITE_PROTOCOL 0

media/ffvpx/libavcodec/allcodecs.c

@@ -58,13 +58,6 @@
             av_register_codec_parser(&ff_##x##_parser);                 \
     }
 
-#define REGISTER_BSF(X, x)                                              \
-    {                                                                   \
-        extern AVBitStreamFilter ff_##x##_bsf;                          \
-        if (CONFIG_##X##_BSF)                                           \
-            av_register_bitstream_filter(&ff_##x##_bsf);                \
-    }
-
 void avcodec_register_all(void)
 {
     static int initialized;
@@ -76,6 +69,7 @@ void avcodec_register_all(void)
     /* hardware accelerators */
     REGISTER_HWACCEL(H263_VAAPI,        h263_vaapi);
     REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox);
+    REGISTER_HWACCEL(H264_CUVID,        h264_cuvid);
     REGISTER_HWACCEL(H264_D3D11VA,      h264_d3d11va);
     REGISTER_HWACCEL(H264_DXVA2,        h264_dxva2);
     REGISTER_HWACCEL(H264_MMAL,         h264_mmal);
@@ -85,6 +79,7 @@ void avcodec_register_all(void)
     REGISTER_HWACCEL(H264_VDA_OLD,      h264_vda_old);
     REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
     REGISTER_HWACCEL(H264_VIDEOTOOLBOX, h264_videotoolbox);
+    REGISTER_HWACCEL(HEVC_CUVID,        hevc_cuvid);
     REGISTER_HWACCEL(HEVC_D3D11VA,      hevc_d3d11va);
     REGISTER_HWACCEL(HEVC_DXVA2,        hevc_dxva2);
     REGISTER_HWACCEL(HEVC_QSV,          hevc_qsv);
@@ -105,12 +100,15 @@ void avcodec_register_all(void)
     REGISTER_HWACCEL(MPEG4_VAAPI,       mpeg4_vaapi);
     REGISTER_HWACCEL(MPEG4_VDPAU,       mpeg4_vdpau);
     REGISTER_HWACCEL(MPEG4_VIDEOTOOLBOX, mpeg4_videotoolbox);
+    REGISTER_HWACCEL(VC1_CUVID,         vc1_cuvid);
     REGISTER_HWACCEL(VC1_D3D11VA,       vc1_d3d11va);
     REGISTER_HWACCEL(VC1_DXVA2,         vc1_dxva2);
     REGISTER_HWACCEL(VC1_VAAPI,         vc1_vaapi);
     REGISTER_HWACCEL(VC1_VDPAU,         vc1_vdpau);
     REGISTER_HWACCEL(VC1_MMAL,          vc1_mmal);
     REGISTER_HWACCEL(VC1_QSV,           vc1_qsv);
+    REGISTER_HWACCEL(VP8_CUVID,         vp8_cuvid);
+    REGISTER_HWACCEL(VP9_CUVID,         vp9_cuvid);
     REGISTER_HWACCEL(VP9_D3D11VA,       vp9_d3d11va);
     REGISTER_HWACCEL(VP9_DXVA2,         vp9_dxva2);
     REGISTER_HWACCEL(VP9_VAAPI,         vp9_vaapi);
@@ -196,6 +194,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (H263P,             h263p);
     REGISTER_DECODER(H264,              h264);
     REGISTER_DECODER(H264_CRYSTALHD,    h264_crystalhd);
+    REGISTER_DECODER(H264_MEDIACODEC,   h264_mediacodec);
     REGISTER_DECODER(H264_MMAL,         h264_mmal);
     REGISTER_DECODER(H264_QSV,          h264_qsv);
     REGISTER_DECODER(H264_VDA,          h264_vda);
@@ -224,6 +223,8 @@ void avcodec_register_all(void)
     REGISTER_DECODER(LAGARITH,          lagarith);
     REGISTER_ENCODER(LJPEG,             ljpeg);
     REGISTER_DECODER(LOCO,              loco);
+    REGISTER_DECODER(M101,              m101);
+    REGISTER_DECODER(MAGICYUV,          magicyuv);
     REGISTER_DECODER(MDEC,              mdec);
     REGISTER_DECODER(MIMIC,             mimic);
     REGISTER_ENCDEC (MJPEG,             mjpeg);
@@ -298,6 +299,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(SDX2_DPCM,         sdx2_dpcm);
     REGISTER_ENCDEC (SGI,               sgi);
     REGISTER_DECODER(SGIRLE,            sgirle);
+    REGISTER_DECODER(SHEERVIDEO,        sheervideo);
     REGISTER_DECODER(SMACKER,           smacker);
     REGISTER_DECODER(SMC,               smc);
     REGISTER_DECODER(SMVJPEG,           smvjpeg);
@@ -316,6 +318,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(TMV,               tmv);
     REGISTER_DECODER(TRUEMOTION1,       truemotion1);
     REGISTER_DECODER(TRUEMOTION2,       truemotion2);
+    REGISTER_DECODER(TRUEMOTION2RT,     truemotion2rt);
     REGISTER_DECODER(TSCC,              tscc);
     REGISTER_DECODER(TSCC2,             tscc2);
     REGISTER_DECODER(TXD,               txd);
@@ -367,6 +370,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(XL,                xl);
     REGISTER_ENCDEC (XWD,               xwd);
     REGISTER_ENCDEC (Y41P,              y41p);
+    REGISTER_DECODER(YLC,               ylc);
     REGISTER_DECODER(YOP,               yop);
     REGISTER_ENCDEC (YUV4,              yuv4);
     REGISTER_DECODER(ZERO12V,           zero12v);
@@ -399,6 +403,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(DSD_MSBF_PLANAR,   dsd_msbf_planar);
     REGISTER_DECODER(DSICINAUDIO,       dsicinaudio);
     REGISTER_DECODER(DSS_SP,            dss_sp);
+    REGISTER_DECODER(DST,               dst);
     REGISTER_ENCDEC (EAC3,              eac3);
     REGISTER_DECODER(EVRC,              evrc);
     REGISTER_DECODER(FFWAVESYNTH,       ffwavesynth);
@@ -514,6 +519,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(ADPCM_G726LE,      adpcm_g726le);
     REGISTER_DECODER(ADPCM_IMA_AMV,     adpcm_ima_amv);
     REGISTER_DECODER(ADPCM_IMA_APC,     adpcm_ima_apc);
+    REGISTER_DECODER(ADPCM_IMA_DAT4,    adpcm_ima_dat4);
     REGISTER_DECODER(ADPCM_IMA_DK3,     adpcm_ima_dk3);
     REGISTER_DECODER(ADPCM_IMA_DK4,     adpcm_ima_dk4);
     REGISTER_DECODER(ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
@@ -526,6 +532,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (ADPCM_IMA_WAV,     adpcm_ima_wav);
     REGISTER_DECODER(ADPCM_IMA_WS,      adpcm_ima_ws);
     REGISTER_ENCDEC (ADPCM_MS,          adpcm_ms);
+    REGISTER_DECODER(ADPCM_MTAF,        adpcm_mtaf);
     REGISTER_DECODER(ADPCM_PSX,         adpcm_psx);
     REGISTER_DECODER(ADPCM_SBPRO_2,     adpcm_sbpro_2);
     REGISTER_DECODER(ADPCM_SBPRO_3,     adpcm_sbpro_3);
@@ -562,8 +569,22 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (XSUB,              xsub);
 
     /* external libraries */
+    REGISTER_ENCDEC (AAC_AT,            aac_at);
+    REGISTER_DECODER(AC3_AT,            ac3_at);
+    REGISTER_DECODER(ADPCM_IMA_QT_AT,   adpcm_ima_qt_at);
+    REGISTER_ENCDEC (ALAC_AT,           alac_at);
+    REGISTER_DECODER(AMR_NB_AT,         amr_nb_at);
+    REGISTER_DECODER(EAC3_AT,           eac3_at);
+    REGISTER_DECODER(GSM_MS_AT,         gsm_ms_at);
+    REGISTER_ENCDEC (ILBC_AT,           ilbc_at);
+    REGISTER_DECODER(MP1_AT,            mp1_at);
+    REGISTER_DECODER(MP2_AT,            mp2_at);
+    REGISTER_DECODER(MP3_AT,            mp3_at);
+    REGISTER_ENCDEC (PCM_ALAW_AT,       pcm_alaw_at);
+    REGISTER_ENCDEC (PCM_MULAW_AT,      pcm_mulaw_at);
+    REGISTER_DECODER(QDMC_AT,           qdmc_at);
+    REGISTER_DECODER(QDM2_AT,           qdm2_at);
     REGISTER_DECODER(LIBCELT,           libcelt);
-    REGISTER_DECODER(LIBDCADEC,         libdcadec)
     REGISTER_ENCODER(LIBFAAC,           libfaac);
     REGISTER_ENCDEC (LIBFDK_AAC,        libfdk_aac);
     REGISTER_ENCDEC (LIBGSM,            libgsm);
@@ -579,7 +600,6 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (LIBSPEEX,          libspeex);
     REGISTER_ENCODER(LIBTHEORA,         libtheora);
     REGISTER_ENCODER(LIBTWOLAME,        libtwolame);
-    REGISTER_ENCDEC (LIBUTVIDEO,        libutvideo);
     REGISTER_ENCODER(LIBVO_AMRWBENC,    libvo_amrwbenc);
     REGISTER_ENCDEC (LIBVORBIS,         libvorbis);
     REGISTER_ENCDEC (LIBVPX_VP8,        libvpx_vp8);
@@ -603,13 +623,27 @@ void avcodec_register_all(void)
     /* external libraries, that shouldn't be used by default if one of the
      * above is available */
     REGISTER_ENCODER(LIBOPENH264,       libopenh264);
+    REGISTER_DECODER(H264_CUVID,        h264_cuvid);
+    REGISTER_ENCODER(H264_NVENC,        h264_nvenc);
+    REGISTER_ENCODER(H264_OMX,          h264_omx);
     REGISTER_ENCODER(H264_QSV,          h264_qsv);
+    REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
+    REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
+#if FF_API_NVENC_OLD_NAME
     REGISTER_ENCODER(NVENC,             nvenc);
     REGISTER_ENCODER(NVENC_H264,        nvenc_h264);
     REGISTER_ENCODER(NVENC_HEVC,        nvenc_hevc);
+#endif
+    REGISTER_DECODER(HEVC_CUVID,        hevc_cuvid);
+    REGISTER_ENCODER(HEVC_NVENC,        hevc_nvenc);
     REGISTER_ENCODER(HEVC_QSV,          hevc_qsv);
+    REGISTER_ENCODER(HEVC_VAAPI,        hevc_vaapi);
     REGISTER_ENCODER(LIBKVAZAAR,        libkvazaar);
+    REGISTER_ENCODER(MJPEG_VAAPI,       mjpeg_vaapi);
     REGISTER_ENCODER(MPEG2_QSV,         mpeg2_qsv);
+    REGISTER_DECODER(VC1_CUVID,         vc1_cuvid);
+    REGISTER_DECODER(VP8_CUVID,         vp8_cuvid);
+    REGISTER_DECODER(VP9_CUVID,         vp9_cuvid);
 
     /* parsers */
     REGISTER_PARSER(AAC,                aac);
@@ -650,20 +684,4 @@ void avcodec_register_all(void)
     REGISTER_PARSER(VP3,                vp3);
     REGISTER_PARSER(VP8,                vp8);
     REGISTER_PARSER(VP9,                vp9);
-
-    /* bitstream filters */
-    REGISTER_BSF(AAC_ADTSTOASC,         aac_adtstoasc);
-    REGISTER_BSF(CHOMP,                 chomp);
-    REGISTER_BSF(DUMP_EXTRADATA,        dump_extradata);
-    REGISTER_BSF(H264_MP4TOANNEXB,      h264_mp4toannexb);
-    REGISTER_BSF(HEVC_MP4TOANNEXB,      hevc_mp4toannexb);
-    REGISTER_BSF(IMX_DUMP_HEADER,       imx_dump_header);
-    REGISTER_BSF(MJPEG2JPEG,            mjpeg2jpeg);
-    REGISTER_BSF(MJPEGA_DUMP_HEADER,    mjpega_dump_header);
-    REGISTER_BSF(MP3_HEADER_DECOMPRESS, mp3_header_decompress);
-    REGISTER_BSF(MPEG4_UNPACK_BFRAMES,  mpeg4_unpack_bframes);
-    REGISTER_BSF(MOV2TEXTSUB,           mov2textsub);
-    REGISTER_BSF(NOISE,                 noise);
-    REGISTER_BSF(REMOVE_EXTRADATA,      remove_extradata);
-    REGISTER_BSF(TEXT2MOVSUB,           text2movsub);
 }

media/ffvpx/libavcodec/avpacket.c

@@ -110,24 +110,38 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
 {
     int new_size;
     av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
-    if (!pkt->size)
-        return av_new_packet(pkt, grow_by);
     if ((unsigned)grow_by >
         INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE))
         return -1;
 
     new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE;
     if (pkt->buf) {
-        int ret = av_buffer_realloc(&pkt->buf, new_size);
-        if (ret < 0)
-            return ret;
+        size_t data_offset;
+        uint8_t *old_data = pkt->data;
+        if (pkt->data == NULL) {
+            data_offset = 0;
+            pkt->data = pkt->buf->data;
+        } else {
+            data_offset = pkt->data - pkt->buf->data;
+            if (data_offset > INT_MAX - new_size)
+                return -1;
+        }
+
+        if (new_size + data_offset > pkt->buf->size) {
+            int ret = av_buffer_realloc(&pkt->buf, new_size + data_offset);
+            if (ret < 0) {
+                pkt->data = old_data;
+                return ret;
+            }
+            pkt->data = pkt->buf->data + data_offset;
+        }
     } else {
         pkt->buf = av_buffer_alloc(new_size);
         if (!pkt->buf)
             return AVERROR(ENOMEM);
-        memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by));
+        memcpy(pkt->buf->data, pkt->data, pkt->size);
+        pkt->data = pkt->buf->data;
     }
-    pkt->data  = pkt->buf->data;
     pkt->size += grow_by;
     memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
 
@@ -335,22 +349,24 @@ uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
 const char *av_packet_side_data_name(enum AVPacketSideDataType type)
 {
     switch(type) {
-    case AV_PKT_DATA_PALETTE:                   return "Palette";
-    case AV_PKT_DATA_NEW_EXTRADATA:             return "New Extradata";
-    case AV_PKT_DATA_PARAM_CHANGE:              return "Param Change";
-    case AV_PKT_DATA_H263_MB_INFO:              return "H263 MB Info";
-    case AV_PKT_DATA_REPLAYGAIN:                return "Replay Gain";
-    case AV_PKT_DATA_DISPLAYMATRIX:             return "Display Matrix";
-    case AV_PKT_DATA_STEREO3D:                  return "Stereo 3D";
-    case AV_PKT_DATA_AUDIO_SERVICE_TYPE:        return "Audio Service Type";
-    case AV_PKT_DATA_SKIP_SAMPLES:              return "Skip Samples";
-    case AV_PKT_DATA_JP_DUALMONO:               return "JP Dual Mono";
-    case AV_PKT_DATA_STRINGS_METADATA:          return "Strings Metadata";
-    case AV_PKT_DATA_SUBTITLE_POSITION:         return "Subtitle Position";
-    case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL:  return "Matroska BlockAdditional";
-    case AV_PKT_DATA_WEBVTT_IDENTIFIER:         return "WebVTT ID";
-    case AV_PKT_DATA_WEBVTT_SETTINGS:           return "WebVTT Settings";
-    case AV_PKT_DATA_METADATA_UPDATE:           return "Metadata Update";
+    case AV_PKT_DATA_PALETTE:                    return "Palette";
+    case AV_PKT_DATA_NEW_EXTRADATA:              return "New Extradata";
+    case AV_PKT_DATA_PARAM_CHANGE:               return "Param Change";
+    case AV_PKT_DATA_H263_MB_INFO:               return "H263 MB Info";
+    case AV_PKT_DATA_REPLAYGAIN:                 return "Replay Gain";
+    case AV_PKT_DATA_DISPLAYMATRIX:              return "Display Matrix";
+    case AV_PKT_DATA_STEREO3D:                   return "Stereo 3D";
+    case AV_PKT_DATA_AUDIO_SERVICE_TYPE:         return "Audio Service Type";
+    case AV_PKT_DATA_SKIP_SAMPLES:               return "Skip Samples";
+    case AV_PKT_DATA_JP_DUALMONO:                return "JP Dual Mono";
+    case AV_PKT_DATA_STRINGS_METADATA:           return "Strings Metadata";
+    case AV_PKT_DATA_SUBTITLE_POSITION:          return "Subtitle Position";
+    case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL:   return "Matroska BlockAdditional";
+    case AV_PKT_DATA_WEBVTT_IDENTIFIER:          return "WebVTT ID";
+    case AV_PKT_DATA_WEBVTT_SETTINGS:            return "WebVTT Settings";
+    case AV_PKT_DATA_METADATA_UPDATE:            return "Metadata Update";
+    case AV_PKT_DATA_MPEGTS_STREAM_ID:           return "MPEGTS Stream ID";
+    case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata";
     }
     return NULL;
 }
@@ -566,16 +582,19 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src)
         if (ret < 0)
             goto fail;
         memcpy(dst->buf->data, src->data, src->size);
+
+        dst->data = dst->buf->data;
     } else {
         dst->buf = av_buffer_ref(src->buf);
         if (!dst->buf) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
+        dst->data = src->data;
     }
 
     dst->size = src->size;
-    dst->data = dst->buf->data;
+
     return 0;
 fail:
     av_packet_free_side_data(dst);
@@ -599,6 +618,8 @@ void av_packet_move_ref(AVPacket *dst, AVPacket *src)
 {
     *dst = *src;
     av_init_packet(src);
+    src->data = NULL;
+    src->size = 0;
 }
 
 void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb)

media/ffvpx/libavcodec/bitstream.c

@@ -34,8 +34,8 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "mathops.h"
-#include "get_bits.h"
 #include "put_bits.h"
+#include "vlc.h"
 
 const uint8_t ff_log2_run[41]={
  0, 0, 0, 0, 1, 1, 1, 1,
@@ -150,7 +150,7 @@ static int compare_vlcspec(const void *a, const void *b)
 /**
  * Build VLC decoding tables suitable for use with get_vlc().
  *
- * @param vlc            the context to be initted
+ * @param vlc            the context to be initialized
  *
  * @param table_nb_bits  max length of vlc codes to store directly in this table
  *                       (Longer codes are delegated to subtables.)
@@ -167,7 +167,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
     int table_size, table_index, index, code_prefix, symbol, subtable_bits;
     int i, j, k, n, nb, inc;
     uint32_t code;
-    volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent a internal compiler error in gcc 4.2
+    volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent an internal compiler error in gcc 4.2
 
     table_size = 1 << table_nb_bits;
     if (table_nb_bits > 30)
@@ -248,7 +248,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
 
 /* Build VLC decoding tables suitable for use with get_vlc().
 
-   'nb_bits' set the decoding table size (2^nb_bits) entries. The
+   'nb_bits' sets the decoding table size (2^nb_bits) entries. The
    bigger it is, the faster is the decoding. But it should not be too
    big to save memory and L1 cache. '9' is a good compromise.
 
@@ -317,7 +317,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes,
         }                                                                   \
         GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);            \
         if (buf[j].code >= (1LL<<buf[j].bits)) {                            \
-            av_log(NULL, AV_LOG_ERROR, "Invalid code in init_vlc\n");       \
+            av_log(NULL, AV_LOG_ERROR, "Invalid code %x for %d in init_vlc\n", buf[j].code, i);\
             if (!(flags & INIT_VLC_USE_NEW_STATIC))                         \
                 av_free(buf);                                               \
             return -1;                                                      \

media/ffvpx/libavcodec/bitstream_filter.c

@@ -1,90 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * 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
- */
-
-#include <string.h>
-
-#include "avcodec.h"
-#include "libavutil/atomic.h"
-#include "libavutil/mem.h"
-
-static AVBitStreamFilter *first_bitstream_filter = NULL;
-
-AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f)
-{
-    if (f)
-        return f->next;
-    else
-        return first_bitstream_filter;
-}
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf)
-{
-    do {
-        bsf->next = first_bitstream_filter;
-    } while(bsf->next != avpriv_atomic_ptr_cas((void * volatile *)&first_bitstream_filter, bsf->next, bsf));
-}
-
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name)
-{
-    AVBitStreamFilter *bsf = NULL;
-
-    while (bsf = av_bitstream_filter_next(bsf)) {
-        if (!strcmp(name, bsf->name)) {
-            AVBitStreamFilterContext *bsfc =
-                av_mallocz(sizeof(AVBitStreamFilterContext));
-            if (!bsfc)
-                return NULL;
-            bsfc->filter    = bsf;
-            bsfc->priv_data = NULL;
-            if (bsf->priv_data_size) {
-                bsfc->priv_data = av_mallocz(bsf->priv_data_size);
-                if (!bsfc->priv_data) {
-                    av_freep(&bsfc);
-                    return NULL;
-                }
-            }
-            return bsfc;
-        }
-    }
-    return NULL;
-}
-
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc)
-{
-    if (!bsfc)
-        return;
-    if (bsfc->filter->close)
-        bsfc->filter->close(bsfc);
-    av_freep(&bsfc->priv_data);
-    av_freep(&bsfc->args);
-    av_parser_close(bsfc->parser);
-    av_free(bsfc);
-}
-
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe)
-{
-    *poutbuf      = (uint8_t *)buf;
-    *poutbuf_size = buf_size;
-    return bsfc->filter->filter(bsfc, avctx, args ? args : bsfc->args,
-                                poutbuf, poutbuf_size, buf, buf_size, keyframe);
-}

media/ffvpx/libavcodec/bsf.c

@@ -0,0 +1,219 @@
+/*
+ * 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
+ */
+
+#include <string.h>
+
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#include "bsf.h"
+
+struct AVBSFInternal {
+    AVPacket *buffer_pkt;
+    int eof;
+};
+
+void av_bsf_free(AVBSFContext **pctx)
+{
+    AVBSFContext *ctx;
+
+    if (!pctx || !*pctx)
+        return;
+    ctx = *pctx;
+
+    if (ctx->filter->close)
+        ctx->filter->close(ctx);
+    if (ctx->filter->priv_class && ctx->priv_data)
+        av_opt_free(ctx->priv_data);
+
+    av_opt_free(ctx);
+
+    av_packet_free(&ctx->internal->buffer_pkt);
+    av_freep(&ctx->internal);
+    av_freep(&ctx->priv_data);
+
+    avcodec_parameters_free(&ctx->par_in);
+    avcodec_parameters_free(&ctx->par_out);
+
+    av_freep(pctx);
+}
+
+static void *bsf_child_next(void *obj, void *prev)
+{
+    AVBSFContext *ctx = obj;
+    if (!prev && ctx->filter->priv_class)
+        return ctx->priv_data;
+    return NULL;
+}
+
+static const AVClass bsf_class = {
+    .class_name       = "AVBSFContext",
+    .item_name        = av_default_item_name,
+    .version          = LIBAVUTIL_VERSION_INT,
+    .child_next       = bsf_child_next,
+    .child_class_next = ff_bsf_child_class_next,
+};
+
+const AVClass *av_bsf_get_class(void)
+{
+    return &bsf_class;
+}
+
+int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
+{
+    AVBSFContext *ctx;
+    int ret;
+
+    ctx = av_mallocz(sizeof(*ctx));
+    if (!ctx)
+        return AVERROR(ENOMEM);
+
+    ctx->av_class = &bsf_class;
+    ctx->filter   = filter;
+
+    ctx->par_in  = avcodec_parameters_alloc();
+    ctx->par_out = avcodec_parameters_alloc();
+    if (!ctx->par_in || !ctx->par_out) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    ctx->internal = av_mallocz(sizeof(*ctx->internal));
+    if (!ctx->internal) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    ctx->internal->buffer_pkt = av_packet_alloc();
+    if (!ctx->internal->buffer_pkt) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    av_opt_set_defaults(ctx);
+
+    /* allocate priv data and init private options */
+    if (filter->priv_data_size) {
+        ctx->priv_data = av_mallocz(filter->priv_data_size);
+        if (!ctx->priv_data) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
+        if (filter->priv_class) {
+            *(const AVClass **)ctx->priv_data = filter->priv_class;
+            av_opt_set_defaults(ctx->priv_data);
+        }
+    }
+
+    *pctx = ctx;
+    return 0;
+fail:
+    av_bsf_free(&ctx);
+    return ret;
+}
+
+int av_bsf_init(AVBSFContext *ctx)
+{
+    int ret, i;
+
+    /* check that the codec is supported */
+    if (ctx->filter->codec_ids) {
+        for (i = 0; ctx->filter->codec_ids[i] != AV_CODEC_ID_NONE; i++)
+            if (ctx->par_in->codec_id == ctx->filter->codec_ids[i])
+                break;
+        if (ctx->filter->codec_ids[i] == AV_CODEC_ID_NONE) {
+            const AVCodecDescriptor *desc = avcodec_descriptor_get(ctx->par_in->codec_id);
+            av_log(ctx, AV_LOG_ERROR, "Codec '%s' (%d) is not supported by the "
+                   "bitstream filter '%s'. Supported codecs are: ",
+                   desc ? desc->name : "unknown", ctx->par_in->codec_id, ctx->filter->name);
+            for (i = 0; ctx->filter->codec_ids[i] != AV_CODEC_ID_NONE; i++) {
+                desc = avcodec_descriptor_get(ctx->filter->codec_ids[i]);
+                av_log(ctx, AV_LOG_ERROR, "%s (%d) ",
+                       desc ? desc->name : "unknown", ctx->filter->codec_ids[i]);
+            }
+            av_log(ctx, AV_LOG_ERROR, "\n");
+            return AVERROR(EINVAL);
+        }
+    }
+
+    /* initialize output parameters to be the same as input
+     * init below might overwrite that */
+    ret = avcodec_parameters_copy(ctx->par_out, ctx->par_in);
+    if (ret < 0)
+        return ret;
+
+    ctx->time_base_out = ctx->time_base_in;
+
+    if (ctx->filter->init) {
+        ret = ctx->filter->init(ctx);
+        if (ret < 0)
+            return ret;
+    }
+
+    return 0;
+}
+
+int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
+{
+    if (!pkt || !pkt->data) {
+        ctx->internal->eof = 1;
+        return 0;
+    }
+
+    if (ctx->internal->eof) {
+        av_log(ctx, AV_LOG_ERROR, "A non-NULL packet sent after an EOF.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (ctx->internal->buffer_pkt->data ||
+        ctx->internal->buffer_pkt->side_data_elems)
+        return AVERROR(EAGAIN);
+
+    av_packet_move_ref(ctx->internal->buffer_pkt, pkt);
+
+    return 0;
+}
+
+int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt)
+{
+    return ctx->filter->filter(ctx, pkt);
+}
+
+int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt)
+{
+    AVBSFInternal *in = ctx->internal;
+    AVPacket *tmp_pkt;
+
+    if (in->eof)
+        return AVERROR_EOF;
+
+    if (!ctx->internal->buffer_pkt->data &&
+        !ctx->internal->buffer_pkt->side_data_elems)
+        return AVERROR(EAGAIN);
+
+    tmp_pkt = av_packet_alloc();
+    if (!tmp_pkt)
+        return AVERROR(ENOMEM);
+
+    *pkt = ctx->internal->buffer_pkt;
+    ctx->internal->buffer_pkt = tmp_pkt;
+
+    return 0;
+}

media/ffvpx/libavcodec/bsf.h

@@ -0,0 +1,33 @@
+/*
+ * 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_BSF_H
+#define AVCODEC_BSF_H
+
+#include "avcodec.h"
+
+/**
+ * Called by the bitstream filters to get the next packet for filtering.
+ * The filter is responsible for either freeing the packet or passing it to the
+ * caller.
+ */
+int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt);
+
+const AVClass *ff_bsf_child_class_next(const AVClass *prev);
+
+#endif /* AVCODEC_BSF_H */

media/ffvpx/libavcodec/codec_desc.c

@@ -887,7 +887,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .id        = AV_CODEC_ID_IFF_ILBM,
         .type      = AVMEDIA_TYPE_VIDEO,
         .name      = "iff_ilbm",
-        .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
+        .long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
     {
@@ -947,6 +947,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_M101,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "m101",
+        .long_name = NULL_IF_CONFIG_SMALL("Matrox Uncompressed SD"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+    },
     {
         .id        = AV_CODEC_ID_MVC1,
         .type      = AVMEDIA_TYPE_VIDEO,
@@ -1528,6 +1535,34 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_TRUEMOTION2RT,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "truemotion2rt",
+        .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_MAGICYUV,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "magicyuv",
+        .long_name = NULL_IF_CONFIG_SMALL("MagicYUV Lossless Video"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_SHEERVIDEO,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "sheervideo",
+        .long_name = NULL_IF_CONFIG_SMALL("BitJazz SheerVideo"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_YLC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "ylc",
+        .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+    },
 
     /* various PCM "codecs" */
     {
@@ -2022,6 +2057,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha AICA"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_ADPCM_IMA_DAT4,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "adpcm_ima_dat4",
+        .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Eurocom DAT4"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* AMR */
     {
@@ -2662,6 +2704,20 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 2"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_DST,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "dst",
+        .long_name = NULL_IF_CONFIG_SMALL("DST (Direct Stream Transfer)"),
+        .props     = AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_ADPCM_MTAF,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "adpcm_mtaf",
+        .long_name = NULL_IF_CONFIG_SMALL("ADPCM MTAF"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* subtitle codecs */
     {

media/ffvpx/libavcodec/dummy_funcs.c

@@ -56,6 +56,12 @@ AVHWAccel ff_vc1_mmal_hwaccel;
 AVHWAccel ff_vp9_d3d11va_hwaccel;
 AVHWAccel ff_vp9_dxva2_hwaccel;
 AVHWAccel ff_vp9_vaapi_hwaccel;
+AVHWAccel ff_vp9_cuvid_hwaccel;
+AVHWAccel ff_vp8_cuvid_hwaccel;
+AVHWAccel ff_vc1_cuvid_hwaccel;
+AVHWAccel ff_hevc_cuvid_hwaccel;
+AVHWAccel ff_h264_cuvid_hwaccel;
+
 AVCodec ff_a64multi_encoder;
 AVCodec ff_a64multi5_encoder;
 AVCodec ff_aasc_decoder;
@@ -666,6 +672,48 @@ AVCodec ff_xma2_decoder;
 AVCodec ff_adpcm_aica_decoder;
 AVCodec ff_adpcm_psx_decoder;
 AVCodec ff_text_encoder;
+AVCodec ff_vp9_cuvid_decoder;
+AVCodec ff_vp8_cuvid_decoder;
+AVCodec ff_vc1_cuvid_decoder;
+AVCodec ff_mjpeg_vaapi_encoder;
+AVCodec ff_hevc_vaapi_encoder;
+AVCodec ff_hevc_nvenc_encoder;
+AVCodec ff_hevc_cuvid_decoder;
+AVCodec ff_h264_videotoolbox_encoder;
+AVCodec ff_h264_vaapi_encoder;
+AVCodec ff_h264_omx_encoder;
+AVCodec ff_h264_nvenc_encoder;
+AVCodec ff_h264_cuvid_decoder;
+AVCodec ff_qdm2_at_decoder;
+AVCodec ff_qdmc_at_decoder;
+AVCodec ff_pcm_mulaw_at_decoder;
+AVCodec ff_pcm_mulaw_at_encoder;
+AVCodec ff_pcm_alaw_at_decoder;
+AVCodec ff_pcm_alaw_at_encoder;
+AVCodec ff_mp3_at_decoder;
+AVCodec ff_mp2_at_decoder;
+AVCodec ff_mp1_at_decoder;
+AVCodec ff_ilbc_at_decoder;
+AVCodec ff_ilbc_at_encoder;
+AVCodec ff_gsm_ms_at_decoder;
+AVCodec ff_eac3_at_decoder;
+AVCodec ff_amr_nb_at_decoder;
+AVCodec ff_alac_at_decoder;
+AVCodec ff_alac_at_encoder;
+AVCodec ff_adpcm_ima_qt_at_decoder;
+AVCodec ff_ac3_at_decoder;
+AVCodec ff_aac_at_decoder;
+AVCodec ff_aac_at_encoder;
+AVCodec ff_adpcm_mtaf_decoder;
+AVCodec ff_adpcm_ima_dat4_decoder;
+AVCodec ff_dst_decoder;
+AVCodec ff_ylc_decoder;
+AVCodec ff_truemotion2rt_decoder;
+AVCodec ff_sheervideo_decoder;
+AVCodec ff_magicyuv_decoder;
+AVCodec ff_m101_decoder;
+AVCodec ff_h264_mediacodec_decoder;
+
 AVCodecParser ff_aac_parser;
 AVCodecParser ff_aac_latm_parser;
 AVCodecParser ff_ac3_parser;
@@ -737,3 +785,12 @@ void ff_vp78dsp_init_ppc(VP8DSPContext *c) {}
 void ff_vp8dsp_init_arm(VP8DSPContext *c) {}
 void ff_vp8dsp_init_mips(VP8DSPContext *c) {}
 void ff_vp9dsp_init_mips(VP9DSPContext *dsp, int bpp) {}
+
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf) {}
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+                               AVCodecContext *avctx, const char *args,
+                               uint8_t **poutbuf, int *poutbuf_size,
+                               const uint8_t *buf, int buf_size, int keyframe) { return 0; }
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name) { return NULL;}
+AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f) { return NULL; }
+void av_register_bitstream_filter(AVBitStreamFilter *bsf) {}

media/ffvpx/libavcodec/error_resilience.h

@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -42,7 +41,7 @@ typedef struct ERPicture {
     AVFrame *f;
     ThreadFrame *tf;
 
-    // it's the caller's responsibility to allocate these buffers
+    // it is the caller's responsibility to allocate these buffers
     int16_t (*motion_val[2])[2];
     int8_t *ref_index[2];
 

media/ffvpx/libavcodec/get_bits.h

@@ -33,6 +33,7 @@
 #include "libavutil/log.h"
 #include "libavutil/avassert.h"
 #include "mathops.h"
+#include "vlc.h"
 
 /*
  * Safe bitstream reading:
@@ -58,20 +59,6 @@ typedef struct GetBitContext {
     int size_in_bits_plus8;
 } GetBitContext;
 
-#define VLC_TYPE int16_t
-
-typedef struct VLC {
-    int bits;
-    VLC_TYPE (*table)[2]; ///< code, bits
-    int table_size, table_allocated;
-} VLC;
-
-typedef struct RL_VLC_ELEM {
-    int16_t level;
-    int8_t len;
-    uint8_t run;
-} RL_VLC_ELEM;
-
 /* Bitstream reader API docs:
  * name
  *   arbitrary name which is used as prefix for the internal variables
@@ -91,7 +78,7 @@ typedef struct RL_VLC_ELEM {
  *
  * GET_CACHE(name, gb)
  *   Will output the contents of the internal cache,
- *   next bit is MSB of 32 or 64 bit (FIXME 64bit).
+ *   next bit is MSB of 32 or 64 bits (FIXME 64 bits).
  *
  * SHOW_UBITS(name, gb, num)
  *   Will return the next num bits.
@@ -224,7 +211,7 @@ static inline void skip_bits_long(GetBitContext *s, int n)
 }
 
 /**
- * read mpeg1 dc style vlc (sign bit + mantissa with no MSB).
+ * Read MPEG-1 dc-style VLC (sign bit + mantissa with no MSB).
  * if MSB not set it is negative
  * @param n length in bits
  */
@@ -398,11 +385,12 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
     }
 }
 
-static inline int check_marker(GetBitContext *s, const char *msg)
+static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
 {
     int bit = get_bits1(s);
     if (!bit)
-        av_log(NULL, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", get_bits_count(s) - 1, s->size_in_bits, msg);
+        av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
+               get_bits_count(s) - 1, s->size_in_bits, msg);
 
     return bit;
 }
@@ -462,33 +450,6 @@ static inline const uint8_t *align_get_bits(GetBitContext *s)
     return s->buffer + (s->index >> 3);
 }
 
-#define init_vlc(vlc, nb_bits, nb_codes,                \
-                 bits, bits_wrap, bits_size,            \
-                 codes, codes_wrap, codes_size,         \
-                 flags)                                 \
-    ff_init_vlc_sparse(vlc, nb_bits, nb_codes,          \
-                       bits, bits_wrap, bits_size,      \
-                       codes, codes_wrap, codes_size,   \
-                       NULL, 0, 0, flags)
-
-int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
-                       const void *bits, int bits_wrap, int bits_size,
-                       const void *codes, int codes_wrap, int codes_size,
-                       const void *symbols, int symbols_wrap, int symbols_size,
-                       int flags);
-void ff_free_vlc(VLC *vlc);
-
-#define INIT_VLC_LE             2
-#define INIT_VLC_USE_NEW_STATIC 4
-
-#define INIT_VLC_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size)       \
-    do {                                                                   \
-        static VLC_TYPE table[static_size][2];                             \
-        (vlc)->table           = table;                                    \
-        (vlc)->table_allocated = static_size;                              \
-        init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \
-    } while (0)
-
 /**
  * If the vlc code is invalid and max_depth=1, then no bits will be removed.
  * If the vlc code is invalid and max_depth>1, then the number of bits removed
@@ -526,7 +487,7 @@ void ff_free_vlc(VLC *vlc);
         SKIP_BITS(name, gb, n);                                 \
     } while (0)
 
-#define GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits,  \
+#define GET_RL_VLC(level, run, name, gb, table, bits,  \
                    max_depth, need_update)                      \
     do {                                                        \
         int n, nb_bits;                                         \
@@ -623,89 +584,4 @@ static inline int skip_1stop_8data_bits(GetBitContext *gb)
     return 0;
 }
 
-//#define TRACE
-
-#ifdef TRACE
-static inline void print_bin(int bits, int n)
-{
-    int i;
-
-    for (i = n - 1; i >= 0; i--)
-        av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1);
-    for (i = n; i < 24; i++)
-        av_log(NULL, AV_LOG_DEBUG, " ");
-}
-
-static inline int get_bits_trace(GetBitContext *s, int n, const char *file,
-                                 const char *func, int line)
-{
-    int r = get_bits(s, n);
-
-    print_bin(r, n);
-    av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n",
-           r, n, r, get_bits_count(s) - n, file, func, line);
-
-    return r;
-}
-
-static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2],
-                                int bits, int max_depth, const char *file,
-                                const char *func, int line)
-{
-    int show  = show_bits(s, 24);
-    int pos   = get_bits_count(s);
-    int r     = get_vlc2(s, table, bits, max_depth);
-    int len   = get_bits_count(s) - pos;
-    int bits2 = show >> (24 - len);
-
-    print_bin(bits2, len);
-
-    av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n",
-           bits2, len, r, pos, file, func, line);
-
-    return r;
-}
-
-#define GET_RL_VLC(level, run, name, gb, table, bits,           \
-                   max_depth, need_update)                      \
-    do {                                                        \
-        int show  = SHOW_UBITS(name, gb, 24);                   \
-        int len;                                                \
-        int pos = name ## _index;                               \
-                                                                \
-        GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits,max_depth, need_update); \
-                                                                \
-        len = name ## _index - pos + 1;                         \
-        show = show >> (24 - len);                              \
-                                                                \
-        print_bin(show, len);                                   \
-                                                                \
-        av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d/%-3d rlv @%5d in %s %s:%d\n",\
-               show, len, run-1, level, pos, __FILE__, __PRETTY_FUNCTION__, __LINE__);\
-    } while (0)                                                 \
-
-
-static inline int get_xbits_trace(GetBitContext *s, int n, const char *file,
-                                  const char *func, int line)
-{
-    int show = show_bits(s, n);
-    int r    = get_xbits(s, n);
-
-    print_bin(show, n);
-    av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n",
-           show, n, r, get_bits_count(s) - n, file, func, line);
-
-    return r;
-}
-
-#define get_bits(s, n)  get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_bits1(s)    get_bits_trace(s,  1, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-
-#define get_vlc(s, vlc)             get_vlc_trace(s, (vlc)->table, (vlc)->bits,   3, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_vlc2(s, tab, bits, max) get_vlc_trace(s,          tab,        bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#else //TRACE
-#define GET_RL_VLC GET_RL_VLC_INTERNAL
-#endif
-
 #endif /* AVCODEC_GET_BITS_H */

media/ffvpx/libavcodec/h264dsp.h

@@ -70,7 +70,7 @@ typedef struct H264DSPContext {
                                             int stride, int alpha, int beta);
     void (*h264_h_loop_filter_chroma_mbaff_intra)(uint8_t *pix /*align 8*/,
                                                   int stride, int alpha, int beta);
-    // h264_loop_filter_strength: simd only. the C version is inlined in h264.c
+    // h264_loop_filter_strength: simd only. the C version is inlined in h264_loopfilter.c
     void (*h264_loop_filter_strength)(int16_t bS[2][4][4], uint8_t nnz[40],
                                       int8_t ref[2][40], int16_t mv[2][40][2],
                                       int bidir, int edges, int step,

media/ffvpx/libavcodec/h264pred.c

@@ -21,7 +21,7 @@
 
 /**
  * @file
- * H.264 / AVC / MPEG4 part10 prediction functions.
+ * H.264 / AVC / MPEG-4 part10 prediction functions.
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
@@ -556,7 +556,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
     h->pred16x16[TOP_DC_PRED8x8 ]= FUNCC(pred16x16_top_dc                 , depth);\
     h->pred16x16[DC_128_PRED8x8 ]= FUNCC(pred16x16_128_dc                 , depth);\
 \
-    /* special lossless h/v prediction for h264 */ \
+    /* special lossless h/v prediction for H.264 */ \
     h->pred4x4_add  [VERT_PRED   ]= FUNCC(pred4x4_vertical_add            , depth);\
     h->pred4x4_add  [ HOR_PRED   ]= FUNCC(pred4x4_horizontal_add          , depth);\
     h->pred8x8l_add [VERT_PRED   ]= FUNCC(pred8x8l_vertical_add           , depth);\

media/ffvpx/libavcodec/h264pred.h

@@ -21,7 +21,7 @@
 
 /**
  * @file
- * H.264 / AVC / MPEG4 prediction functions.
+ * H.264 / AVC / MPEG-4 prediction functions.
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
@@ -75,7 +75,7 @@
 #define TOP_DC_PRED8x8         5
 #define DC_128_PRED8x8         6
 
-// H264/SVQ3 (8x8) specific
+// H.264/SVQ3 (8x8) specific
 #define ALZHEIMER_DC_L0T_PRED8x8  7
 #define ALZHEIMER_DC_0LT_PRED8x8  8
 #define ALZHEIMER_DC_L00_PRED8x8  9

media/ffvpx/libavcodec/h264pred_template.c

@@ -21,7 +21,7 @@
 
 /**
  * @file
- * H.264 / AVC / MPEG4 part10 prediction functions.
+ * H.264 / AVC / MPEG-4 part10 prediction functions.
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 

media/ffvpx/libavcodec/imgconvert.c

@@ -231,33 +231,5 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
 
     return 0;
 }
-
-#ifdef TEST
-
-int main(void){
-    int i;
-    int err=0;
-    int skip = 0;
-
-    for (i=0; i<AV_PIX_FMT_NB*2; i++) {
-        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
-        if(!desc || !desc->name) {
-            skip ++;
-            continue;
-        }
-        if (skip) {
-            av_log(NULL, AV_LOG_INFO, "%3d unused pixel format values\n", skip);
-            skip = 0;
-        }
-        av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc));
-        if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) {
-            av_log(NULL, AV_LOG_ERROR, "Alpha flag mismatch\n");
-            err = 1;
-        }
-    }
-    return err;
-}
-
-#endif
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif /* FF_API_AVPICTURE */

media/ffvpx/libavcodec/internal.h

@@ -160,6 +160,19 @@ typedef struct AVCodecInternal {
      * hwaccel-specific private data
      */
     void *hwaccel_priv_data;
+
+    /**
+     * checks API usage: after codec draining, flush is required to resume operation
+     */
+    int draining;
+
+    /**
+     * buffers for using new encode/decode API through legacy API
+     */
+    AVPacket *buffer_pkt;
+    int buffer_pkt_valid; // encoding: packet without data can be valid
+    AVFrame *buffer_frame;
+    int draining_done;
 } AVCodecInternal;
 
 struct AVCodecDefault {
@@ -293,6 +306,8 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p,
                                       const uint8_t *end,
                                       uint32_t *state);
 
+int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);
+
 /**
  * Check that the provided frame dimensions are valid and set them on the codec
  * context.
@@ -330,4 +345,19 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx);
 
 int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type);
 
+/**
+ * Check AVFrame for A53 side data and allocate and fill SEI message with A53 info
+ *
+ * @param frame      Raw frame to get A53 side data from
+ * @param prefix_len Number of bytes to allocate before SEI message
+ * @param data       Pointer to a variable to store allocated memory
+ *                   Upon return the variable will hold NULL on error or if frame has no A53 info.
+ *                   Otherwise it will point to prefix_len uninitialized bytes followed by
+ *                   *sei_size SEI message
+ * @param sei_size   Pointer to a variable to store generated SEI message length
+ * @return           Zero on success, negative error code on failure
+ */
+int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
+                     void **data, size_t *sei_size);
+
 #endif /* AVCODEC_INTERNAL_H */

media/ffvpx/libavcodec/mathops.h

@@ -33,6 +33,7 @@ extern const uint32_t ff_inverse[257];
 extern const uint8_t ff_sqrt_tab[256];
 extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
 extern const uint8_t ff_zigzag_direct[64];
+extern const uint8_t ff_zigzag_scan[16+1];
 
 #if   ARCH_ARM
 #   include "arm/mathops.h"

media/ffvpx/libavcodec/mathtables.c

@@ -105,3 +105,10 @@ const uint8_t ff_zigzag_direct[64] = {
     58, 59, 52, 45, 38, 31, 39, 46,
     53, 60, 61, 54, 47, 55, 62, 63
 };
+
+const uint8_t ff_zigzag_scan[16+1] = {
+    0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4,
+    1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4,
+    1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4,
+    3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
+};

media/ffvpx/libavcodec/moz.build

@@ -17,7 +17,6 @@ SOURCES += [
     'avpacket.c',
     'avpicture.c',
     'bitstream.c',
-    'bitstream_filter.c',
     'codec_desc.c',
     'dummy_funcs.c',
     'h264pred.c',

media/ffvpx/libavcodec/mpeg12data.h

@@ -1,5 +1,5 @@
 /*
- * MPEG1/2 tables
+ * MPEG-1/2 tables
  * copyright (c) 2000,2001 Fabrice Bellard
  * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
@@ -22,7 +22,7 @@
 
 /**
  * @file
- * MPEG1/2 tables.
+ * MPEG-1/2 tables.
  */
 
 #ifndef AVCODEC_MPEG12DATA_H

media/ffvpx/libavcodec/mpegvideo.h

@@ -81,16 +81,16 @@ typedef struct MpegEncContext {
     int y_dc_scale, c_dc_scale;
     int ac_pred;
     int block_last_index[12];  ///< last non zero coefficient in block
-    int h263_aic;              ///< Advanded INTRA Coding (AIC)
+    int h263_aic;              ///< Advanced INTRA Coding (AIC)
 
     /* scantables */
-    ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce tha cache usage
+    ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce the cache usage
     ScanTable intra_scantable;
     ScanTable intra_h_scantable;
     ScanTable intra_v_scantable;
 
     /* WARNING: changes above this line require updates to hardcoded
-     *          offsets used in asm. */
+     *          offsets used in ASM. */
 
     struct AVCodecContext *avctx;
     /* the following parameters must be initialized before encoding */
@@ -99,20 +99,20 @@ typedef struct MpegEncContext {
     int intra_only;   ///< if true, only intra pictures are generated
     int64_t bit_rate; ///< wanted bit rate
     enum OutputFormat out_format; ///< output format
-    int h263_pred;    ///< use mpeg4/h263 ac/dc predictions
-    int pb_frame;     ///< PB frame mode (0 = none, 1 = base, 2 = improved)
+    int h263_pred;    ///< use MPEG-4/H.263 ac/dc predictions
+    int pb_frame;     ///< PB-frame mode (0 = none, 1 = base, 2 = improved)
 
 /* the following codec id fields are deprecated in favor of codec_id */
-    int h263_plus;    ///< h263 plus headers
-    int h263_flv;     ///< use flv h263 header
+    int h263_plus;    ///< H.263+ headers
+    int h263_flv;     ///< use flv H.263 header
 
     enum AVCodecID codec_id;     /* see AV_CODEC_ID_xxx */
     int fixed_qscale; ///< fixed qscale if non zero
     int encoding;     ///< true if we are encoding (vs decoding)
-    int max_b_frames; ///< max number of b-frames for encoding
+    int max_b_frames; ///< max number of B-frames for encoding
     int luma_elim_threshold;
     int chroma_elim_threshold;
-    int strict_std_compliance; ///< strictly follow the std (MPEG4, ...)
+    int strict_std_compliance; ///< strictly follow the std (MPEG-4, ...)
     int workaround_bugs;       ///< workaround bugs in encoders which cannot be detected automatically
     int codec_tag;             ///< internal codec_tag upper case converted from avctx codec_tag
     /* the following fields are managed internally by the encoder */
@@ -132,7 +132,7 @@ typedef struct MpegEncContext {
     ptrdiff_t uvlinesize;      ///< line size, for chroma in bytes, may be different from width
     Picture *picture;          ///< main picture buffer
     Picture **input_picture;   ///< next pictures on display order for encoding
-    Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding
+    Picture **reordered_input_picture; ///< pointer to the next pictures in coded order for encoding
 
     int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_encode_video2()
     /**
@@ -179,19 +179,19 @@ typedef struct MpegEncContext {
     Picture *last_picture_ptr;     ///< pointer to the previous picture.
     Picture *next_picture_ptr;     ///< pointer to the next picture (for bidir pred)
     Picture *current_picture_ptr;  ///< pointer to the current picture
-    int last_dc[3];                ///< last DC values for MPEG1
+    int last_dc[3];                ///< last DC values for MPEG-1
     int16_t *dc_val_base;
-    int16_t *dc_val[3];            ///< used for mpeg4 DC prediction, all 3 arrays must be continuous
+    int16_t *dc_val[3];            ///< used for MPEG-4 DC prediction, all 3 arrays must be continuous
     const uint8_t *y_dc_scale_table;     ///< qscale -> y_dc_scale table
     const uint8_t *c_dc_scale_table;     ///< qscale -> c_dc_scale table
-    const uint8_t *chroma_qscale_table;  ///< qscale -> chroma_qscale (h263)
+    const uint8_t *chroma_qscale_table;  ///< qscale -> chroma_qscale (H.263)
     uint8_t *coded_block_base;
     uint8_t *coded_block;          ///< used for coded block pattern prediction (msmpeg4v3, wmv1)
     int16_t (*ac_val_base)[16];
-    int16_t (*ac_val[3])[16];      ///< used for mpeg4 AC prediction, all 3 arrays must be continuous
+    int16_t (*ac_val[3])[16];      ///< used for MPEG-4 AC prediction, all 3 arrays must be continuous
     int mb_skipped;                ///< MUST BE SET only during DECODING
     uint8_t *mbskip_table;        /**< used to avoid copy if macroblock skipped (for black regions for example)
-                                   and used for b-frame encoding & decoding (contains skip table of next P Frame) */
+                                   and used for B-frame encoding & decoding (contains skip table of next P-frame) */
     uint8_t *mbintra_table;       ///< used to avoid setting {ac, dc, cbp}-pred stuff to zero on inter MB decoding
     uint8_t *cbp_table;           ///< used to store cbp, ac_pred for partitioned decoding
     uint8_t *pred_dir_table;      ///< used to store pred_dir for partitioned decoding
@@ -200,7 +200,7 @@ typedef struct MpegEncContext {
 
     int qscale;                 ///< QP
     int chroma_qscale;          ///< chroma QP
-    unsigned int lambda;        ///< lagrange multipler used in rate distortion
+    unsigned int lambda;        ///< Lagrange multiplier used in rate distortion
     unsigned int lambda2;       ///< (lambda*lambda) >> FF_LAMBDA_SHIFT
     int *lambda_table;
     int adaptive_quant;         ///< use adaptive quantization
@@ -209,7 +209,7 @@ typedef struct MpegEncContext {
     int pict_type;              ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ...
     int vbv_delay;
     int last_pict_type; //FIXME removes
-    int last_non_b_pict_type;   ///< used for mpeg4 gmc b-frames & ratecontrol
+    int last_non_b_pict_type;   ///< used for MPEG-4 gmc B-frames & ratecontrol
     int droppable;
     int frame_rate_index;
     AVRational mpeg2_frame_rate_ext;
@@ -218,7 +218,7 @@ typedef struct MpegEncContext {
 
     /* motion compensation */
     int unrestricted_mv;        ///< mv can point outside of the coded picture
-    int h263_long_vectors;      ///< use horrible h263v1 long vector mode
+    int h263_long_vectors;      ///< use horrible H.263v1 long vector mode
 
     BlockDSPContext bdsp;
     FDCTDSPContext fdsp;
@@ -233,7 +233,7 @@ typedef struct MpegEncContext {
     VideoDSPContext vdsp;
     H263DSPContext h263dsp;
     int f_code;                 ///< forward MV resolution
-    int b_code;                 ///< backward MV resolution for B Frames (mpeg4)
+    int b_code;                 ///< backward MV resolution for B-frames (MPEG-4)
     int16_t (*p_mv_table_base)[2];
     int16_t (*b_forw_mv_table_base)[2];
     int16_t (*b_back_mv_table_base)[2];
@@ -242,14 +242,14 @@ typedef struct MpegEncContext {
     int16_t (*b_direct_mv_table_base)[2];
     int16_t (*p_field_mv_table_base[2][2])[2];
     int16_t (*b_field_mv_table_base[2][2][2])[2];
-    int16_t (*p_mv_table)[2];            ///< MV table (1MV per MB) p-frame encoding
-    int16_t (*b_forw_mv_table)[2];       ///< MV table (1MV per MB) forward mode b-frame encoding
-    int16_t (*b_back_mv_table)[2];       ///< MV table (1MV per MB) backward mode b-frame encoding
-    int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding
-    int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding
-    int16_t (*b_direct_mv_table)[2];     ///< MV table (1MV per MB) direct mode b-frame encoding
-    int16_t (*p_field_mv_table[2][2])[2];   ///< MV table (2MV per MB) interlaced p-frame encoding
-    int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced b-frame encoding
+    int16_t (*p_mv_table)[2];            ///< MV table (1MV per MB) P-frame encoding
+    int16_t (*b_forw_mv_table)[2];       ///< MV table (1MV per MB) forward mode B-frame encoding
+    int16_t (*b_back_mv_table)[2];       ///< MV table (1MV per MB) backward mode B-frame encoding
+    int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode B-frame encoding
+    int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode B-frame encoding
+    int16_t (*b_direct_mv_table)[2];     ///< MV table (1MV per MB) direct mode B-frame encoding
+    int16_t (*p_field_mv_table[2][2])[2];   ///< MV table (2MV per MB) interlaced P-frame encoding
+    int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced B-frame encoding
     uint8_t (*p_field_select_table[2]);
     uint8_t (*b_field_select_table[2][2]);
 #if FF_API_MOTION_EST
@@ -261,10 +261,10 @@ typedef struct MpegEncContext {
     int mv_dir;
 #define MV_DIR_FORWARD   1
 #define MV_DIR_BACKWARD  2
-#define MV_DIRECT        4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4)
+#define MV_DIRECT        4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (MPEG-4)
     int mv_type;
 #define MV_TYPE_16X16       0   ///< 1 vector for the whole mb
-#define MV_TYPE_8X8         1   ///< 4 vectors (h263, mpeg4 4MV)
+#define MV_TYPE_8X8         1   ///< 4 vectors (H.263, MPEG-4 4MV)
 #define MV_TYPE_16X8        2   ///< 2 vectors, one per 16x8 block
 #define MV_TYPE_FIELD       3   ///< 2 vectors, one per field
 #define MV_TYPE_DMV         4   ///< 2 vectors, special mpeg2 Dual Prime Vectors
@@ -275,14 +275,14 @@ typedef struct MpegEncContext {
     */
     int mv[2][4][2];
     int field_select[2][2];
-    int last_mv[2][2][2];             ///< last MV, used for MV prediction in MPEG1 & B-frame MPEG4
+    int last_mv[2][2][2];             ///< last MV, used for MV prediction in MPEG-1 & B-frame MPEG-4
     uint8_t *fcode_tab;               ///< smallest fcode needed for each MV
     int16_t direct_scale_mv[2][64];   ///< precomputed to avoid divisions in ff_mpeg4_set_direct_mv
 
     MotionEstContext me;
 
-    int no_rounding;  /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...)
-                        for b-frames rounding mode is always 0 */
+    int no_rounding;  /**< apply no rounding to motion compensation (MPEG-4, msmpeg4, ...)
+                        for B-frames rounding mode is always 0 */
 
     /* macroblock layer */
     int mb_x, mb_y;
@@ -357,7 +357,7 @@ typedef struct MpegEncContext {
     int resync_mb_y;                 ///< y position of last resync marker
     GetBitContext last_resync_gb;    ///< used to search for the next resync marker
     int mb_num_left;                 ///< number of MBs left in this video packet (for partitioned Slices only)
-    int next_p_frame_damaged;        ///< set if the next p frame is damaged, to avoid showing trashed b frames
+    int next_p_frame_damaged;        ///< set if the next p frame is damaged, to avoid showing trashed B-frames
 
     ParseContext parse_context;
 
@@ -372,7 +372,7 @@ typedef struct MpegEncContext {
     int rc_strategy;
 
     /* H.263+ specific */
-    int umvplus;                    ///< == H263+ && unrestricted_mv
+    int umvplus;                    ///< == H.263+ && unrestricted_mv
     int h263_aic_dir;               ///< AIC direction: 0 = left, 1 = top
     int h263_slice_structured;
     int alt_inter_vlc;              ///< alternative inter vlc
@@ -380,7 +380,7 @@ typedef struct MpegEncContext {
     int loop_filter;
     int custom_pcf;
 
-    /* mpeg4 specific */
+    /* MPEG-4 specific */
     ///< number of bits to represent the fractional part of time (encoder only)
     int time_increment_bits;
     int last_time_base;
@@ -401,12 +401,12 @@ typedef struct MpegEncContext {
     int sprite_warping_accuracy;
     int data_partitioning;           ///< data partitioning flag from header
     int partitioned_frame;           ///< is current frame partitioned
-    int low_delay;                   ///< no reordering needed / has no b-frames
+    int low_delay;                   ///< no reordering needed / has no B-frames
     int vo_type;
     PutBitContext tex_pb;            ///< used for data partitioned VOPs
     PutBitContext pb2;               ///< used for data partitioned VOPs
     int mpeg_quant;
-    int padding_bug_score;             ///< used to detect the VERY common padding bug in MPEG4
+    int padding_bug_score;             ///< used to detect the VERY common padding bug in MPEG-4
 
     /* divx specific, used to workaround (many) bugs in divx5 */
     int divx_packed;
@@ -430,7 +430,7 @@ typedef struct MpegEncContext {
     int dc_table_index;
     int use_skip_mb_code;
     int slice_height;      ///< in macroblocks
-    int first_slice_line;  ///< used in mpeg4 too to handle resync markers
+    int first_slice_line;  ///< used in MPEG-4 too to handle resync markers
     int flipflop_rounding;
     int msmpeg4_version;   ///< 0=not msmpeg4, 1=mp41, 2=mp42, 3=mp43/divx3 4=wmv1/7 5=wmv2/8
     int per_mb_rl_table;
@@ -444,9 +444,9 @@ typedef struct MpegEncContext {
     /* decompression specific */
     GetBitContext gb;
 
-    /* Mpeg1 specific */
-    int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific
-    int last_mv_dir;         ///< last mv_dir, used for b frame encoding
+    /* MPEG-1 specific */
+    int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & MPEG-1 specific
+    int last_mv_dir;         ///< last mv_dir, used for B-frame encoding
     uint8_t *vbv_delay_ptr;  ///< pointer to vbv_delay in the bitstream
 
     /* MPEG-2-specific - I wished not to have to support this mess. */
@@ -514,9 +514,9 @@ typedef struct MpegEncContext {
                            int16_t *block/*align 16*/, int n, int qscale);
     void (*dct_unquantize_h263_inter)(struct MpegEncContext *s,
                            int16_t *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
+    void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)
                            int16_t *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
+    void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)
                            int16_t *block/*align 16*/, int n, int qscale);
     int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
     int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);

media/ffvpx/libavcodec/options.c

@@ -89,7 +89,7 @@ static const AVClass av_codec_context_class = {
     .get_category            = get_category,
 };
 
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
+static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
 {
     int flags=0;
     memset(s, 0, sizeof(AVCodecContext));
@@ -146,6 +146,13 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
     return 0;
 }
 
+#if FF_API_GET_CONTEXT_DEFAULTS
+int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
+{
+    return init_context_defaults(s, codec);
+}
+#endif
+
 AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
 {
     AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
@@ -153,7 +160,7 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
     if (!avctx)
         return NULL;
 
-    if(avcodec_get_context_defaults3(avctx, codec) < 0){
+    if (init_context_defaults(avctx, codec) < 0) {
         av_free(avctx);
         return NULL;
     }
@@ -179,6 +186,7 @@ void avcodec_free_context(AVCodecContext **pavctx)
     av_freep(pavctx);
 }
 
+#if FF_API_COPY_CONTEXT
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
 {
     const AVCodec *orig_codec = dest->codec;
@@ -225,6 +233,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
     dest->inter_matrix    = NULL;
     dest->rc_override     = NULL;
     dest->subtitle_header = NULL;
+    dest->hw_frames_ctx   = NULL;
 
 #define alloc_and_copy_or_fail(obj, size, pad) \
     if (src->obj && size > 0) { \
@@ -245,19 +254,27 @@ FF_ENABLE_DEPRECATION_WARNINGS
     av_assert0(dest->subtitle_header_size == src->subtitle_header_size);
 #undef alloc_and_copy_or_fail
 
+    if (src->hw_frames_ctx) {
+        dest->hw_frames_ctx = av_buffer_ref(src->hw_frames_ctx);
+        if (!dest->hw_frames_ctx)
+            goto fail;
+    }
+
     return 0;
 
 fail:
+    av_freep(&dest->subtitle_header);
     av_freep(&dest->rc_override);
     av_freep(&dest->intra_matrix);
     av_freep(&dest->inter_matrix);
     av_freep(&dest->extradata);
-    av_freep(&dest->subtitle_header);
+    av_buffer_unref(&dest->hw_frames_ctx);
     dest->subtitle_header_size = 0;
     dest->extradata_size = 0;
     av_opt_free(dest);
     return AVERROR(ENOMEM);
 }
+#endif
 
 const AVClass *avcodec_get_class(void)
 {

media/ffvpx/libavcodec/options_table.h

@@ -90,6 +90,7 @@ static const AVOption avcodec_options[] = {
 {"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"},
 {"export_mvs", "export motion vectors through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_EXPORT_MVS}, INT_MIN, INT_MAX, V|D, "flags2"},
 {"skip_manual", "do not skip samples and export skip information as frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SKIP_MANUAL}, INT_MIN, INT_MAX, V|D, "flags2"},
+{"ass_ro_flush_noop", "do not reset ASS ReadOrder field on flush", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_RO_FLUSH_NOOP}, INT_MIN, INT_MAX, S|D, "flags2"},
 #if FF_API_MOTION_EST
 {"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"},
 {"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" },
@@ -120,7 +121,7 @@ static const AVOption avcodec_options[] = {
 {"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E},
 {"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 1024, V|E},
 {"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E},
-{"bf", "set maximum number of B frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E},
+{"bf", "set maximum number of B-frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E},
 {"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
 #if FF_API_RC_STRATEGY
 {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -163,11 +164,11 @@ static const AVOption avcodec_options[] = {
 {"ms", "work around various bugs in Microsoft's broken decoders", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_MS }, INT_MIN, INT_MAX, V|D, "bug"},
 {"trunc", "truncated frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_TRUNCATED}, INT_MIN, INT_MAX, V|D, "bug"},
 {"strict", "how strictly to follow the standards", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
-{"very", "strictly conform to a older more strict version of the spec or reference software", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_VERY_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
+{"very", "strictly conform to a older more strict version of the spec or reference software", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_VERY_STRICT }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
+{"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
+{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
+{"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
+{"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
 {"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
 {"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
@@ -253,6 +254,7 @@ static const AVOption avcodec_options[] = {
 {"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"},
 #endif
 {"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
+{"sar",    "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
 {"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"},
 {"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO }, INT_MIN, INT_MAX, V|D, "debug"},
 {"rc", "rate control", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_RC }, INT_MIN, INT_MAX, V|E, "debug"},
@@ -519,6 +521,15 @@ static const AVOption avcodec_options[] = {
 {"do_nothing",  NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_DO_NOTHING},  INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
 {"auto",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC},   INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
 {"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
+#if FF_API_ASS_TIMING
+{"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS}, 0, 1, S|D, "sub_text_format"},
+#else
+{"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D, "sub_text_format"},
+#endif
+{"ass",              NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS},              INT_MIN, INT_MAX, S|D, "sub_text_format"},
+#if FF_API_ASS_TIMING
+{"ass_with_timings", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS}, INT_MIN, INT_MAX, S|D, "sub_text_format"},
+#endif
 {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D },
 #if FF_API_SIDEDATA_ONLY_PKT
 {"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E },

media/ffvpx/libavcodec/parser.c

@@ -141,6 +141,8 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx,
     int index, i;
     uint8_t dummy_buf[AV_INPUT_BUFFER_PADDING_SIZE];
 
+    av_assert1(avctx->codec_id != AV_CODEC_ID_NONE);
+
     /* Parsers only work for the specified codec ids. */
     av_assert1(avctx->codec_id == s->parser->codec_ids[0] ||
                avctx->codec_id == s->parser->codec_ids[1] ||