Message ID | 20220311142354.32338-1-martin@martin.st |
---|---|
State | Accepted |
Commit | a4c4e6b9c03ff50ac5c57e5d1bd79d71e9acca8d |
Headers | show |
Series | [FFmpeg-devel] movenc: Use LIBAVFORMAT_IDENT instead of LIBAVCODEC_IDENT | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_aarch64_jetson | success | Make finished |
andriy/make_fate_aarch64_jetson | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On 3/11/2022 11:23 AM, Martin Storsjö wrote: > The muxer seems to have had one seemingly accidental use of > LIBAVCODEC_IDENT, while LIBAVFORMAT_IDENT probably is the > relevant one (which is used multiple times in the same file). > > Signed-off-by: Martin Storsjö <martin@martin.st> > --- > libavformat/movenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 4c868919ae..a2c2145354 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -4108,7 +4108,7 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) > avio_wb16(pb, 0x021C); /* data */ > > if (!(s->flags & AVFMT_FLAG_BITEXACT)) > - mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04); > + mov_write_psp_udta_tag(pb, LIBAVFORMAT_IDENT, "eng", 0x04); > mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); > mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); > LGTM
On Sat, 12 Mar 2022, James Almer wrote: > > > On 3/11/2022 11:23 AM, Martin Storsjö wrote: >> The muxer seems to have had one seemingly accidental use of >> LIBAVCODEC_IDENT, while LIBAVFORMAT_IDENT probably is the >> relevant one (which is used multiple times in the same file). >> >> Signed-off-by: Martin Storsjö <martin@martin.st> >> --- >> libavformat/movenc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >> index 4c868919ae..a2c2145354 100644 >> --- a/libavformat/movenc.c >> +++ b/libavformat/movenc.c >> @@ -4108,7 +4108,7 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, > AVFormatContext *s) >> avio_wb16(pb, 0x021C); /* data */ >> >> if (!(s->flags & AVFMT_FLAG_BITEXACT)) >> - mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", > 0x04); >> + mov_write_psp_udta_tag(pb, LIBAVFORMAT_IDENT, "eng", > 0x04); >> mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); >> mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); >> > > LGTM Thanks, pushed. // Martin
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..a2c2145354 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4108,7 +4108,7 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) avio_wb16(pb, 0x021C); /* data */ if (!(s->flags & AVFMT_FLAG_BITEXACT)) - mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04); + mov_write_psp_udta_tag(pb, LIBAVFORMAT_IDENT, "eng", 0x04); mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);
The muxer seems to have had one seemingly accidental use of LIBAVCODEC_IDENT, while LIBAVFORMAT_IDENT probably is the relevant one (which is used multiple times in the same file). Signed-off-by: Martin Storsjö <martin@martin.st> --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)