* [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. @ 2025-06-28 0:46 Ken McGaugh 2025-06-28 1:51 ` Baptiste Coudurier 0 siblings, 1 reply; 6+ messages in thread From: Ken McGaugh @ 2025-06-28 0:46 UTC (permalink / raw) To: ffmpeg-devel Hi, first time contributing to ffmpeg so I hope I got this right. We use custom udta tags in our pipeline but they were not coming through correctly. Looks like they were incorrectly being routed through the code path for "raw" data. --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index bd6b23466b..1b17f52a16 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -484,7 +484,7 @@ retry: return ret; } } else return 0; - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { str_size = avio_rb16(pb); // string length if (str_size > atom.size) { raw = 1; -- 2.39.5 (Apple Git-154) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 2025-06-28 0:46 [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified Ken McGaugh @ 2025-06-28 1:51 ` Baptiste Coudurier 2025-06-28 8:04 ` Ken McGaugh 0 siblings, 1 reply; 6+ messages in thread From: Baptiste Coudurier @ 2025-06-28 1:51 UTC (permalink / raw) To: FFmpeg development discussions and patches Hi > On Jun 27, 2025, at 5:46 PM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > > Hi, first time contributing to ffmpeg so I hope I got this right. We use > custom udta tags in our pipeline but they were not coming through > correctly. Looks like they were incorrectly being routed through the code > path for "raw" data. > --- > libavformat/mov.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index bd6b23466b..1b17f52a16 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -484,7 +484,7 @@ retry: > return ret; > } > } else return 0; > - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { > + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { > str_size = avio_rb16(pb); // string length > if (str_size > atom.size) { > raw = 1; > -- > 2.39.5 (Apple Git-154) Thanks! Would it be possible for you to share a small sample? — Baptiste Coudurier _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 2025-06-28 1:51 ` Baptiste Coudurier @ 2025-06-28 8:04 ` Ken McGaugh 2025-06-28 19:43 ` Baptiste Coudurier 0 siblings, 1 reply; 6+ messages in thread From: Ken McGaugh @ 2025-06-28 8:04 UTC (permalink / raw) To: FFmpeg development discussions and patches On Sat, 28 Jun 2025 at 13:52, Baptiste Coudurier < baptiste.coudurier-at-gmail.com@ffmpeg.org> wrote: > Hi > > > On Jun 27, 2025, at 5:46 PM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > > > > Hi, first time contributing to ffmpeg so I hope I got this right. We use > > custom udta tags in our pipeline but they were not coming through > > correctly. Looks like they were incorrectly being routed through the code > > path for "raw" data. > > --- > > libavformat/mov.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > index bd6b23466b..1b17f52a16 100644 > > --- a/libavformat/mov.c > > +++ b/libavformat/mov.c > > @@ -484,7 +484,7 @@ retry: > > return ret; > > } > > } else return 0; > > - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { > > + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { > > str_size = avio_rb16(pb); // string length > > if (str_size > atom.size) { > > raw = 1; > > -- > > 2.39.5 (Apple Git-154) > > Thanks! > Would it be possible for you to share a small sample? > > Certainly. Here is a sample .mov with a handful of custom udta atoms. For example, the '[169]tco' one should have the value "FrameNumber", but without this patch it is exported as an empty string. https://drive.google.com/file/d/1KJgRueP26cuo1os2OaNqBz2u8-aeUbBS/view?usp=sharing --Ken _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 2025-06-28 8:04 ` Ken McGaugh @ 2025-06-28 19:43 ` Baptiste Coudurier 2025-06-28 20:33 ` Ken McGaugh 0 siblings, 1 reply; 6+ messages in thread From: Baptiste Coudurier @ 2025-06-28 19:43 UTC (permalink / raw) To: FFmpeg development discussions and patches Hey Ken > On Jun 28, 2025, at 1:04 AM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > > On Sat, 28 Jun 2025 at 13:52, Baptiste Coudurier < > baptiste.coudurier-at-gmail.com@ffmpeg.org <mailto:baptiste.coudurier-at-gmail.com@ffmpeg.org>> wrote: > >> Hi >> >>> On Jun 27, 2025, at 5:46 PM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: >>> >>> Hi, first time contributing to ffmpeg so I hope I got this right. We use >>> custom udta tags in our pipeline but they were not coming through >>> correctly. Looks like they were incorrectly being routed through the code >>> path for "raw" data. >>> --- >>> libavformat/mov.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>> index bd6b23466b..1b17f52a16 100644 >>> --- a/libavformat/mov.c >>> +++ b/libavformat/mov.c >>> @@ -484,7 +484,7 @@ retry: >>> return ret; >>> } >>> } else return 0; >>> - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { >>> + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { >>> str_size = avio_rb16(pb); // string length >>> if (str_size > atom.size) { >>> raw = 1; >>> -- >>> 2.39.5 (Apple Git-154) >> >> Thanks! >> Would it be possible for you to share a small sample? >> >> > Certainly. Here is a sample .mov with a handful of custom udta atoms. For > example, the '[169]tco' one should have the value "FrameNumber", but > without this patch it is exported as an empty string. > > https://drive.google.com/file/d/1KJgRueP26cuo1os2OaNqBz2u8-aeUbBS/view?usp=sharing > Thanks! I feel we should do "if (atom.size > 4 && (key || c->export_all) && !c->itunes_metadata && !raw” to be safer. What do you think ? — Baptiste Coudurier _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 2025-06-28 19:43 ` Baptiste Coudurier @ 2025-06-28 20:33 ` Ken McGaugh 2025-06-28 21:42 ` Ken McGaugh 0 siblings, 1 reply; 6+ messages in thread From: Ken McGaugh @ 2025-06-28 20:33 UTC (permalink / raw) To: FFmpeg development discussions and patches On Sun, 29 Jun 2025 at 7:44 AM, Baptiste Coudurier < baptiste.coudurier-at-gmail.com@ffmpeg.org> wrote: > Hey Ken > > > On Jun 28, 2025, at 1:04 AM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > > > > On Sat, 28 Jun 2025 at 13:52, Baptiste Coudurier < > > baptiste.coudurier-at-gmail.com@ffmpeg.org <mailto: > baptiste.coudurier-at-gmail.com@ffmpeg.org>> wrote: > > > >> Hi > >> > >>> On Jun 27, 2025, at 5:46 PM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > >>> > >>> Hi, first time contributing to ffmpeg so I hope I got this right. We > use > >>> custom udta tags in our pipeline but they were not coming through > >>> correctly. Looks like they were incorrectly being routed through the > code > >>> path for "raw" data. > >>> --- > >>> libavformat/mov.c | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/libavformat/mov.c b/libavformat/mov.c > >>> index bd6b23466b..1b17f52a16 100644 > >>> --- a/libavformat/mov.c > >>> +++ b/libavformat/mov.c > >>> @@ -484,7 +484,7 @@ retry: > >>> return ret; > >>> } > >>> } else return 0; > >>> - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { > >>> + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { > >>> str_size = avio_rb16(pb); // string length > >>> if (str_size > atom.size) { > >>> raw = 1; > >>> -- > >>> 2.39.5 (Apple Git-154) > >> > >> Thanks! > >> Would it be possible for you to share a small sample? > >> > >> > > Certainly. Here is a sample .mov with a handful of custom udta atoms. For > > example, the '[169]tco' one should have the value "FrameNumber", but > > without this patch it is exported as an empty string. > > > > > https://drive.google.com/file/d/1KJgRueP26cuo1os2OaNqBz2u8-aeUbBS/view?usp=sharing > > > > Thanks! > I feel we should do "if (atom.size > 4 && (key || c->export_all) && > !c->itunes_metadata && !raw” to be safer. > What do you think ? That would definitely be safer. Thanks for catching that. Do you need me to submit an updated patch? —Ken > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 2025-06-28 20:33 ` Ken McGaugh @ 2025-06-28 21:42 ` Ken McGaugh 0 siblings, 0 replies; 6+ messages in thread From: Ken McGaugh @ 2025-06-28 21:42 UTC (permalink / raw) To: FFmpeg development discussions and patches On Sun, 29 Jun 2025 at 08:33, Ken McGaugh <ken@mcgaugh.co.uk> wrote: > On Sun, 29 Jun 2025 at 7:44 AM, Baptiste Coudurier < > baptiste.coudurier-at-gmail.com@ffmpeg.org> wrote: > >> Hey Ken >> >> > On Jun 28, 2025, at 1:04 AM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: >> > >> > On Sat, 28 Jun 2025 at 13:52, Baptiste Coudurier < >> > baptiste.coudurier-at-gmail.com@ffmpeg.org <mailto: >> baptiste.coudurier-at-gmail.com@ffmpeg.org>> wrote: >> > >> >> Hi >> >> >> >>> On Jun 27, 2025, at 5:46 PM, Ken McGaugh <ken@mcgaugh.co.uk> wrote: >> >>> >> >>> Hi, first time contributing to ffmpeg so I hope I got this right. We >> use >> >>> custom udta tags in our pipeline but they were not coming through >> >>> correctly. Looks like they were incorrectly being routed through the >> code >> >>> path for "raw" data. >> >>> --- >> >>> libavformat/mov.c | 2 +- >> >>> 1 file changed, 1 insertion(+), 1 deletion(-) >> >>> >> >>> diff --git a/libavformat/mov.c b/libavformat/mov.c >> >>> index bd6b23466b..1b17f52a16 100644 >> >>> --- a/libavformat/mov.c >> >>> +++ b/libavformat/mov.c >> >>> @@ -484,7 +484,7 @@ retry: >> >>> return ret; >> >>> } >> >>> } else return 0; >> >>> - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { >> >>> + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { >> >>> str_size = avio_rb16(pb); // string length >> >>> if (str_size > atom.size) { >> >>> raw = 1; >> >>> -- >> >>> 2.39.5 (Apple Git-154) >> >> >> >> Thanks! >> >> Would it be possible for you to share a small sample? >> >> >> >> >> > Certainly. Here is a sample .mov with a handful of custom udta atoms. >> For >> > example, the '[169]tco' one should have the value "FrameNumber", but >> > without this patch it is exported as an empty string. >> > >> > >> https://drive.google.com/file/d/1KJgRueP26cuo1os2OaNqBz2u8-aeUbBS/view?usp=sharing >> > >> >> Thanks! >> I feel we should do "if (atom.size > 4 && (key || c->export_all) && >> !c->itunes_metadata && !raw” to be safer. >> What do you think ? > > > That would definitely be safer. Thanks for catching that. Do you need me > to submit an updated patch? > Here it is in case you need it from me. Thanks again for your prompt review. --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index bd6b23466b..31ebcebca1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -484,7 +484,7 @@ retry: return ret; } } else return 0; - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { + } else if (atom.size > 4 && (key || c->export_all) && !c->itunes_metadata && !raw) { str_size = avio_rb16(pb); // string length if (str_size > atom.size) { raw = 1; -- 2.39.5 (Apple Git-154) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-06-28 21:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-06-28 0:46 [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified Ken McGaugh 2025-06-28 1:51 ` Baptiste Coudurier 2025-06-28 8:04 ` Ken McGaugh 2025-06-28 19:43 ` Baptiste Coudurier 2025-06-28 20:33 ` Ken McGaugh 2025-06-28 21:42 ` Ken McGaugh
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git