[vlc-commits] avcodec: remove a conditional compilation

[Zhao Zhili]

vlc | branch: master | Zhao Zhili <quinkblack at foxmail.com> | Sun Oct  4 18:03:00 2020 +0200| [3a658328fe93637b1423fc5675f7d2190d4d37bf] | committer: Steve Lhomme

avcodec: remove a conditional compilation

1. FF_THREAD_FRAME is in the FFmpeg code base since 2011.

2. codec/avcodec/video.c and codec/avcodec/directx_va.c use
FF_THREAD_FRAME directly without check.

3. FF_THREAD_FRAME is a thread type, it's not a multithreads decoding
support flag.

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a658328fe93637b1423fc5675f7d2190d4d37bf
---

 modules/codec/avcodec/avcodec.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 75bb9337d7..2db8797d32 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -133,10 +133,8 @@ vlc_module_begin ()
     add_string( "avcodec-codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
     add_obsolete_bool( "ffmpeg-hw" ) /* removed since 2.1.0 */
     add_obsolete_string( "avcodec-hw" ) /* removed since 4.0.0 */
-#if defined(FF_THREAD_FRAME)
     add_obsolete_integer( "ffmpeg-threads" ) /* removed since 2.1.0 */
     add_integer( "avcodec-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
-#endif
     add_string( "avcodec-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )