[FFmpeg-cvslog] avformat/mxfenc: adjust product name when opatom muxer is used

Robert Krüger git at videolan.org
Tue Mar 3 12:14:56 CET 2015


ffmpeg | branch: master | Robert Krüger <krueger at lesspain.de> | Sun Mar  1 13:02:20 2015 +0100| [618021ea58cda5ce294efa53ce5a69ce27420ef8] | committer: Michael Niedermayer

avformat/mxfenc: adjust product name when opatom muxer is used

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 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 dfa647d..7d35af4 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -639,7 +639,7 @@ static void mxf_write_identification(AVFormatContext *s)
     MXFContext *mxf = s->priv_data;
     AVIOContext *pb = s->pb;
     const char *company = "FFmpeg";
-    const char *product = "OP1a Muxer";
+    const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer";
     const char *version;
     int length;
 
diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom
index d62d803..f03e9fc 100644
--- a/tests/ref/lavf/mxf_opatom
+++ b/tests/ref/lavf/mxf_opatom
@@ -1,3 +1,3 @@
-8b312335b1af76e0133092c2658cd4a4 *./tests/data/lavf/lavf.mxf_opatom
+f52285c3a157c77eb86c372dd46a2bb0 *./tests/data/lavf/lavf.mxf_opatom
 4716601 ./tests/data/lavf/lavf.mxf_opatom
 ./tests/data/lavf/lavf.mxf_opatom CRC=0xbdd696b9



More information about the ffmpeg-cvslog mailing list