mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
a5679933c1
webm usually has invisible superframes merged with normal frames. (vpxenc muxes them in this form, which is evidence enough that this is the standard webm packet format. It's rather unclear whether ffmpeg is even allowed to remux them with split packets.) The vp9 decoder needs them to be in separate packets for multithreading to work. Add the BSF to the decoder, so the conversion happens automatically. This contains the important part offa1749dd34, which was apparently skipped in commitd417e95af7. This restores Libav API compatibility.
132 lines
4.5 KiB
C
132 lines
4.5 KiB
C
/*
|
|
* 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_VERSION_H
|
|
#define AVCODEC_VERSION_H
|
|
|
|
/**
|
|
* @file
|
|
* @ingroup libavc
|
|
* Libavcodec version macros.
|
|
*/
|
|
|
|
#include "libavutil/version.h"
|
|
|
|
#define LIBAVCODEC_VERSION_MAJOR 58
|
|
#define LIBAVCODEC_VERSION_MINOR 6
|
|
#define LIBAVCODEC_VERSION_MICRO 102
|
|
|
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
|
|
|
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
|
|
|
/**
|
|
* FF_API_* defines may be placed below to indicate public API that will be
|
|
* dropped at a future version bump. The defines themselves are not part of
|
|
* the public API and may change, break or disappear at any time.
|
|
*
|
|
* @note, when bumping the major version it is recommended to manually
|
|
* disable each FF_API_* in its own commit instead of disabling them all
|
|
* at once through the bump. This improves the git bisect-ability of the change.
|
|
*/
|
|
|
|
#ifndef FF_API_LOWRES
|
|
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_DEBUG_MV
|
|
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
|
|
#endif
|
|
#ifndef FF_API_AVCTX_TIMEBASE
|
|
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_CODED_FRAME
|
|
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_SIDEDATA_ONLY_PKT
|
|
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_VDPAU_PROFILE
|
|
#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_CONVERGENCE_DURATION
|
|
#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_AVPICTURE
|
|
#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_AVPACKET_OLD_API
|
|
#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_RTP_CALLBACK
|
|
#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_VBV_DELAY
|
|
#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_CODER_TYPE
|
|
#define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_STAT_BITS
|
|
#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_PRIVATE_OPT
|
|
#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_ASS_TIMING
|
|
#define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_OLD_BSF
|
|
#define FF_API_OLD_BSF (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_COPY_CONTEXT
|
|
#define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_GET_CONTEXT_DEFAULTS
|
|
#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_NVENC_OLD_NAME
|
|
#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_STRUCT_VAAPI_CONTEXT
|
|
#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_MERGE_SD_API
|
|
#define FF_API_MERGE_SD_API (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_TAG_STRING
|
|
#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_GETCHROMA
|
|
#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_CODEC_GET_SET
|
|
#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
#ifndef FF_API_USER_VISIBLE_AVHWACCEL
|
|
#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
#endif
|
|
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|