git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98c1a83
)
avcodec: remove unecessary check for thread safety on safe libavcodec builds
author
Steve Lhomme
<robUx4@videolabs.io>
Tue, 21 Mar 2017 10:27:59 +0000
(11:27 +0100)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Mon, 27 Mar 2017 06:56:07 +0000
(08:56 +0200)
Technically there's not a version set after Anton's patches merge in FFmpeg yet
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/codec/avcodec/video.c
patch
|
blob
|
history
diff --git
a/modules/codec/avcodec/video.c
b/modules/codec/avcodec/video.c
index
570d8e1
..
f49e82d
100644
(file)
--- a/
modules/codec/avcodec/video.c
+++ b/
modules/codec/avcodec/video.c
@@
-1348,7
+1348,7
@@
static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
if (!can_hwaccel)
return swfmt;
-#if
(LIBAVCODEC_VERSION_MICRO >= 100) /* FFmpeg only */
+#if
!LIBAVCODEC_VERSION_CHECK(57, 30, 1, 83, 101)
if (p_context->active_thread_type)
{
msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",