[FFmpeg-cvslog] avformat/mxfenc: Correct klv_fill_key

Michael Niedermayer git at videolan.org
Mon Jun 1 15:58:18 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 29 23:53:52 2015 +0200| [2e92a27a909526692e56df069165565ae0c3f5f7] | committer: Michael Niedermayer

avformat/mxfenc: Correct klv_fill_key

See SMPTE 377-1-2009 6.3.3 KLV Fill Items

Reviewed-by: tim nicholson <nichot20 at yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e92a27a909526692e56df069165565ae0c3f5f7
---

 libavformat/mxfenc.c            |    2 +-
 tests/ref/lavf/mxf              |    6 +++---
 tests/ref/lavf/mxf_d10          |    2 +-
 tests/ref/lavf/mxf_opatom       |    2 +-
 tests/ref/lavf/mxf_opatom_audio |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 63471e6..e0ae14e 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -334,7 +334,7 @@ static const uint8_t index_table_segment_key[]     = { 0x06,0x0E,0x2B,0x34,0x02,
 static const uint8_t random_index_pack_key[]       = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x11,0x01,0x00 };
 static const uint8_t header_open_partition_key[]   = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }; // OpenIncomplete
 static const uint8_t header_closed_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x04,0x00 }; // ClosedComplete
-static const uint8_t klv_fill_key[]                = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x03,0x01,0x02,0x10,0x01,0x00,0x00,0x00 };
+static const uint8_t klv_fill_key[]                = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x10,0x01,0x00,0x00,0x00 };
 static const uint8_t body_partition_key[]          = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x03,0x04,0x00 }; // ClosedComplete
 
 /**
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 248b144..71f6cf8 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,9 +1,9 @@
-25db47584d9c494dea21828eb33c0e36 *./tests/data/lavf/lavf.mxf
+030961ae56ab1c264390fd5ef0a95069 *./tests/data/lavf/lavf.mxf
 525881 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
-9bc9964c9640df6aebae856cc3f431e9 *./tests/data/lavf/lavf.mxf
+b90dc91dee50a24c8b20a08a063f501a *./tests/data/lavf/lavf.mxf
 561209 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0x11a6178e
-357eadc0b797764987afc0109c1efbc4 *./tests/data/lavf/lavf.mxf
+a0cfffed795686127061feae8cde07d1 *./tests/data/lavf/lavf.mxf
 525881 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10
index 35a44fc..8b71d72 100644
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@
-791fa19b49065b9877f157fc4f01999a *./tests/data/lavf/lavf.mxf_d10
+9b5bad981e08fa3eaeb9de818762218c *./tests/data/lavf/lavf.mxf_d10
 5330989 ./tests/data/lavf/lavf.mxf_d10
 ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom
index 0b6a957..3dbb8de 100644
--- a/tests/ref/lavf/mxf_opatom
+++ b/tests/ref/lavf/mxf_opatom
@@ -1,3 +1,3 @@
-903fe08625ff84a5a667566aaaac3cf9 *./tests/data/lavf/lavf.mxf_opatom
+6cab8f702746ca7184c608b4c06a224b *./tests/data/lavf/lavf.mxf_opatom
 4717113 ./tests/data/lavf/lavf.mxf_opatom
 ./tests/data/lavf/lavf.mxf_opatom CRC=0xbdd696b9
diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio
index 3c6aabf..8d558c6 100644
--- a/tests/ref/lavf/mxf_opatom_audio
+++ b/tests/ref/lavf/mxf_opatom_audio
@@ -1,3 +1,3 @@
-019ec38a36d41e62d9ebdd25ff7e471f *./tests/data/lavf/lavf.mxf_opatom_audio
+6c6064f154688e455ec494d425b525f5 *./tests/data/lavf/lavf.mxf_opatom_audio
 102457 ./tests/data/lavf/lavf.mxf_opatom_audio
 ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff



More information about the ffmpeg-cvslog mailing list