[FFmpeg-devel] [PATCH v2 14/18] lavc/svq3: stop including h264dec.h

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Wed Jan 26 16:04:05 EET 2022


Anton Khirnov:
> Quoting Andreas Rheinhardt (2022-01-24 21:09:27)
>> From: Anton Khirnov <anton at khirnov.net>
>>
>> The only thing that is actually used directly from there is the
>> PART_NOT_AVAILABLE constant, which can be trivially copied to svq3
>> decoder itself.
>>
>> Otherwise it only depends on other indirectly included headers.
>> ---
>>  libavcodec/svq3.c | 7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
>> index a3f434ff8d..f06404da9d 100644
>> --- a/libavcodec/svq3.c
>> +++ b/libavcodec/svq3.c
>> @@ -49,13 +49,16 @@
>>  #include "internal.h"
>>  #include "avcodec.h"
>>  #include "mpegutils.h"
>> -#include "h264dec.h"
>>  #include "h264data.h"
>> +#include "h264dsp.h"
>> +#include "h264pred.h"
>> +#include "h264_parse.h"
>>  #include "golomb.h"
>>  #include "hpeldsp.h"
>>  #include "mathops.h"
>>  #include "rectangle.h"
>>  #include "tpeldsp.h"
>> +#include "videodsp.h"
>>  
>>  #if CONFIG_ZLIB
>>  #include <zlib.h>
>> @@ -63,6 +66,8 @@
>>  
>>  #include "svq1.h"
>>  
>> +#define PART_NOT_AVAILABLE -2
> 
> Didn't you want to move it to h264pred? I'm fine with that.
> 

Yes, I wanted to so, but I didn't want to do it behind your back. Will
do now.

- Andreas


More information about the ffmpeg-devel mailing list