diff options
author | Aman Gupta <aman@tmm1.net> | 2018-07-31 14:33:08 -0700 |
---|---|---|
committer | Aman Gupta <aman@tmm1.net> | 2018-08-03 11:07:31 -0700 |
commit | fab3418cb9e4661405e669b07498fdfdded39ce3 (patch) | |
tree | 938d731dfc289a148c6b0321f2f7c2a9ac1a7047 /libavformat/libsmbclient.c | |
parent | 9cc5337247b2eab04966af71057381d95f852e55 (diff) | |
download | ffmpeg-fab3418cb9e4661405e669b07498fdfdded39ce3.tar.gz |
avcodec/mediacodecdec: fix SEGV on modern nvidia decoders
This code came originally from gstreamer, where it was added in [1]
as a work-around for the Tegra 3. (The alignment was changed in [2]
as a response to [3], from 32-bit to 16-bit).
gstreamer only used this workaround in the case where the decoder
didn't return a slice-height property, but when the code was copied
into avcodec the conditional got lost. This commit restores the guard
and prefers the slice-height from the decoder when it is available.
This fixes segfaults decoding 1920x1080 h264 and mpeg2 videos on the
NVidia SHIELD after upgrading to Android Oreo.
[1] https://github.com/GStreamer/gst-plugins-bad/commit/a870e6a5c30dd85240fe75c7409cc1cf1b86541d
[2] https://github.com/GStreamer/gst-plugins-bad/commit/21ff3ae0b0127bd82951d278ca24f2d54133b7cd
[3] https://bugzilla.gnome.org/show_bug.cgi?id=748867
Signed-off-by: Aman Gupta <aman@tmm1.net>
(cherry picked from commit 476fd6ba3a7d74ed8be9af10cb9f4d4b3fdaf3e1)
Diffstat (limited to 'libavformat/libsmbclient.c')
0 files changed, 0 insertions, 0 deletions