diff options
| author | wm4 <nfxjfg@googlemail.com> | 2017-11-17 14:15:22 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-11-29 17:18:12 +0100 |
| commit | a5679933c1b8b6bef5c5c3eb7c70d06c695066cf (patch) | |
| tree | e1061c6c7012c7ec4b523319bf591f7eb89a3532 /libavcodec | |
| parent | 91127355f5863e1f830e0a718036ad7189f42df3 (diff) | |
| download | ffmpeg-a5679933c1b8b6bef5c5c3eb7c70d06c695066cf.tar.gz | |
vp9: use superframe split BSF
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 of fa1749dd34c55fb9, which
was apparently skipped in commit d417e95af76. This restores Libav API
compatibility.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavcodec/vp9.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 55bb5c5e01..d67b689142 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 6 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 1ea2869c4c..6241f01de1 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1795,6 +1795,7 @@ AVCodec ff_vp9_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp9_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), + .bsfs = "vp9_superframe_split", .hw_configs = (const AVCodecHWConfigInternal*[]) { #if CONFIG_VP9_DXVA2_HWACCEL HWACCEL_DXVA2(vp9), |