[FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

[John Stebbins]

On 09/06/2018 03:40 PM, James Almer wrote:
> On 8/27/2018 6:07 PM, John Stebbins wrote:
>> On 08/27/2018 02:03 PM, James Almer wrote:
>>> On 8/27/2018 5:48 PM, John Stebbins wrote:
>>>> On 08/27/2018 01:29 PM, James Almer wrote:
>>>>> On 8/27/2018 4:57 PM, John Stebbins wrote:
>>>>>> Fixes ticket #6897
>>>>>> ---
>>>>>>  libavformat/movenc.c | 40 +++++++++++++++++++++++++++++-----------
>>>>>>  1 file changed, 29 insertions(+), 11 deletions(-)
>>>>>>
>>>>>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
>>>>>> index 8a3b651514..dd6281d210 100644
>>>>>> --- a/libavformat/movenc.c
>>>>>> +++ b/libavformat/movenc.c
>>>>>> @@ -1589,6 +1589,26 @@ static const AVCodecTag codec_cover_image_tags[] = {
>>>>>>      { AV_CODEC_ID_NONE, 0 },
>>>>>>  };
>>>>>>  
>>>>>> +static int validate_codec_tag(const AVCodecTag *const *tags,
>>>>>> +                              unsigned int tag, int codec_id)
>>>>>> +{
>>>>>> +    int i;
>>>>>> +
>>>>>> +    /**
>>>>>> +     * Check that tag + id is in the table
>>>>>> +     */
>>>>>> +    for (i = 0; tags && tags[i]; i++) {
>>>>>> +        const AVCodecTag *codec_tags = tags[i];
>>>>>> +        while (codec_tags->id != AV_CODEC_ID_NONE) {
>>>>>> +            if (codec_tags->tag == tag && codec_tags->id == codec_id) {
>>>>> Make both tag checks case insensitive using avpriv_toupper4(), then
>>>>> return codec_tags->tag instead of 1 if the check succeeds.
>>>> I've never seen mismatched case in these tags, but sure, why not... there's plenty I haven't seen.
>>> AV1 in IVF is AV01, wheres in mp4 it's av01. That's the case i had in
>>> mind when requesting this.
>> Hmm, I should probably return codec_tags->tag in this case rather than tag since it is the expected capitalization for
>> the container.  I'll have to fix that (again).
> What's the status of this? With that change i think it should be good to
> go in.

It's good as far as I'm concerned.  I don't have commit privs.


-- 
John      GnuPG fingerprint: D0EC B3DB C372 D1F1 0B01  83F0 49F1 D7B2 60D4 D0F7


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180907/ffdd0f13/attachment.sig>