| Message ID | 20211214152743.57273-1-nicolas.gaullier@cji.paris |
|---|---|
| State | Accepted |
| Commit | 1cbeac0c2f7e15add5fed0a306f63a87b330c0a1 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/mxfenc: fix DNxHD GC container_ul | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Tue, Dec 14, 2021 at 04:27:42PM +0100, Nicolas Gaullier wrote: > Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> > --- > libavformat/mxfenc.c | 2 +- > tests/ref/lavf/mxf_opatom | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > index fcd9afda2a..512baa45d3 100644 > --- a/libavformat/mxfenc.c > +++ b/libavformat/mxfenc.c > @@ -181,7 +181,7 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { > { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00,0x00,0x00 }, > mxf_write_cdci_desc }, > // DNxHD > - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, > + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, > { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, > { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 }, > mxf_write_cdci_desc }, > diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom > index 61e755550b..b818f26c36 100644 > --- a/tests/ref/lavf/mxf_opatom > +++ b/tests/ref/lavf/mxf_opatom > @@ -1,3 +1,3 @@ > -5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom > +e558e50a94d88762e07ab8149aced7b9 *tests/data/lavf/lavf.mxf_opatom > 4717625 tests/data/lavf/lavf.mxf_opatom > tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a > -- > 2.34.0 LGTM, thanks Matthieu [...]
tis 2021-12-14 klockan 16:27 +0100 skrev Nicolas Gaullier: > Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> > --- > libavformat/mxfenc.c | 2 +- > tests/ref/lavf/mxf_opatom | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > index fcd9afda2a..512baa45d3 100644 > --- a/libavformat/mxfenc.c > +++ b/libavformat/mxfenc.c > @@ -181,7 +181,7 @@ static const MXFContainerEssenceEntry > mxf_essence_container_uls[] = { > { > 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00 > ,0x00,0x00 }, > mxf_write_cdci_desc }, > // DNxHD > - { { > 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11 > ,0x01,0x00 }, > + { { > 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11 > ,0x01,0x00 }, > { > 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01 > ,0x05,0x00 }, > { > 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01 > ,0x00,0x00 }, > mxf_write_cdci_desc }, > diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom > index 61e755550b..b818f26c36 100644 > --- a/tests/ref/lavf/mxf_opatom > +++ b/tests/ref/lavf/mxf_opatom > @@ -1,3 +1,3 @@ > -5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom > +e558e50a94d88762e07ab8149aced7b9 *tests/data/lavf/lavf.mxf_opatom > 4717625 tests/data/lavf/lavf.mxf_opatom > tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a Should be fine based on previous discussion /Tomas
On Thu, 16 Dec 2021, Tomas Härdin wrote: > tis 2021-12-14 klockan 16:27 +0100 skrev Nicolas Gaullier: >> Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> >> --- >> libavformat/mxfenc.c | 2 +- >> tests/ref/lavf/mxf_opatom | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c >> index fcd9afda2a..512baa45d3 100644 >> --- a/libavformat/mxfenc.c >> +++ b/libavformat/mxfenc.c >> @@ -181,7 +181,7 @@ static const MXFContainerEssenceEntry >> mxf_essence_container_uls[] = { >> { >> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00 >> ,0x00,0x00 }, >> mxf_write_cdci_desc }, >> // DNxHD >> - { { >> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11 >> ,0x01,0x00 }, >> + { { >> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11 >> ,0x01,0x00 }, >> { >> 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01 >> ,0x05,0x00 }, >> { >> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01 >> ,0x00,0x00 }, >> mxf_write_cdci_desc }, >> diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom >> index 61e755550b..b818f26c36 100644 >> --- a/tests/ref/lavf/mxf_opatom >> +++ b/tests/ref/lavf/mxf_opatom >> @@ -1,3 +1,3 @@ >> -5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom >> +e558e50a94d88762e07ab8149aced7b9 *tests/data/lavf/lavf.mxf_opatom >> 4717625 tests/data/lavf/lavf.mxf_opatom >> tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a > > Should be fine based on previous discussion Applied the series. Thanks, Marton
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index fcd9afda2a..512baa45d3 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -181,7 +181,7 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00,0x00,0x00 }, mxf_write_cdci_desc }, // DNxHD - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 }, mxf_write_cdci_desc }, diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 61e755550b..b818f26c36 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom +e558e50a94d88762e07ab8149aced7b9 *tests/data/lavf/lavf.mxf_opatom 4717625 tests/data/lavf/lavf.mxf_opatom tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> --- libavformat/mxfenc.c | 2 +- tests/ref/lavf/mxf_opatom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)