[FFmpeg-devel] [PATCH 6/7] avcodec/internal.h: Move avpriv_find_start_code() to startcode.h

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Sat Feb 5 10:04:24 EET 2022


Scott Theisen:
> On 2/4/22 10:16, Andreas Rheinhardt wrote:
>> This is by definition the appropriate place for it.
>> Remove all the now unnecessary libavcodec/internal.h inclusions;
>> also remove other unnecessary headers from the affected files.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
>> ---
> 
>>
>> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
>> index b19befef21..c7c7323351 100644
>> --- a/libavcodec/utils.c
>> +++ b/libavcodec/utils.c
>> @@ -27,7 +27,6 @@
>>     #include "config.h"
>>   #include "libavutil/avassert.h"
>> -#include "libavutil/avstring.h"
>>   #include "libavutil/channel_layout.h"
>>   #include "libavutil/intreadwrite.h"
>>   #include "libavutil/mem.h"
>> @@ -40,12 +39,9 @@
>>   #include "thread.h"
>>   #include "internal.h"
>>   #include "put_bits.h"
>> -#include "raw.h"
>> +#include "startcode.h"
>>   #include <stdlib.h>
>> -#include <stdarg.h>
>> -#include <stdatomic.h>
>>   #include <limits.h>
>> -#include <float.h>
>>     void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t
>> min_size)
>>   {
> 
> Shouldn't you also move the definition to startcode.c as well? Then
> utils.c doesn't need startcode.h.

startcode.c is only compiled conditionally and the check is done in
configure, so I would have to add new configure dependencies. Yet
configure dependencies only take effect after a reconfigure, but there
is no good way to force a reconfigure (only adding a new codec, filter
or format forces this).
(There is a workaround: Modify the files containing the codecs, filters
or formats lists somehow, but this is not nice.)

- Andreas


More information about the ffmpeg-devel mailing list