[vlc-devel] [PATCH v2 4/4] avcodec: remove a conditional compilation

[Zhao Zhili]

On 10/5/20 3:18 PM, Thomas Guillem wrote:
>
> On Sun, Oct 4, 2020, at 18:03, Zhao Zhili wrote:
>> 1. FF_THREAD_FRAME is in the FFmpeg code base not after 2011.
> You mean "is not" ?

I mean "is in the FFmpeg code base since 2011 at least."

Git shows FFmpeg added the flag in 37b00b47 in 2011. But

VLC use the flag since 2010.

>
> Otherwise, LGTM.
>> 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.
>> ---
>>   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 )
>>   
>>   
>> -- 
>> 2.25.1
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel