From 85b221e4d3e7f42cfcf4a491b357b137f731e9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 29 Feb 2012 17:35:00 +0200 Subject: [PATCH] dpxenc: Don't include the libavcodec ident if bitexact mode is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids breaking fate every time the lavc version is bumped. Signed-off-by: Martin Storsjö --- libavcodec/dpxenc.c | 3 ++- tests/ref/lavf/dpx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index c731bb44c5..89548ba0c3 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -126,7 +126,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy (buf + 8, "V1.0", 4); write32(buf + 20, 1); /* new image */ write32(buf + 24, HEADER_SIZE); - memcpy (buf + 160, LIBAVCODEC_IDENT, FFMIN(sizeof(LIBAVCODEC_IDENT), 100)); + if (!(avctx->flags & CODEC_FLAG_BITEXACT)) + memcpy (buf + 160, LIBAVCODEC_IDENT, FFMIN(sizeof(LIBAVCODEC_IDENT), 100)); write32(buf + 660, 0xFFFFFFFF); /* unencrypted */ /* Image information header */ diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx index 61c462a60e..a852ae058e 100644 --- a/tests/ref/lavf/dpx +++ b/tests/ref/lavf/dpx @@ -1,3 +1,3 @@ -5bb43eae2d80da95d26f7fe4669d6166 *./tests/data/images/dpx/02.dpx +808ea110635774252439722a48329d61 *./tests/data/images/dpx/02.dpx ./tests/data/images/dpx/%02d.dpx CRC=0x6da01946 305792 ./tests/data/images/dpx/02.dpx