[FFmpeg-cvslog] dpxenc: Don't include the libavcodec ident if bitexact mode is enabled

Martin Storsjö git at videolan.org
Thu Mar 1 03:20:20 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 29 17:35:00 2012 +0200| [85b221e4d3e7f42cfcf4a491b357b137f731e9d6] | committer: Martin Storsjö

dpxenc: Don't include the libavcodec ident if bitexact mode is enabled

This avoids breaking fate every time the lavc version is bumped.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 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 c731bb4..89548ba 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 61c462a..a852ae0 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



More information about the ffmpeg-cvslog mailing list