diff options
| author | Robert Krüger <krueger@lesspain.de> | 2015-03-01 13:02:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 12:13:21 +0100 |
| commit | 618021ea58cda5ce294efa53ce5a69ce27420ef8 (patch) | |
| tree | 7cdee52dfe54877d16c92fe76a33a9e61a6e8cfc | |
| parent | 5de2dab12b951b2fe121eb18503accfc91cd1565 (diff) | |
| download | ffmpeg-618021ea58cda5ce294efa53ce5a69ce27420ef8.tar.gz | |
avformat/mxfenc: adjust product name when opatom muxer is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfenc.c | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/mxf_opatom | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index dfa647de3c..7d35af4dcc 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 d62d80373a..f03e9fcc54 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 |