summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-17 01:37:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-17 01:37:59 +0100
commit905c4dc2b0d564e1b9b6bc6eeca0b8915b81cd8c (patch)
treec46faa7a7d8da8a87243282401827072b7314445
parent00430075bd0f06e4c6d9612f3a522255155b035b (diff)
dpxenc: Dont store lavc indent when bitexact is set.
This avoids fate breakage from bumping version. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dpxenc.c4
-rw-r--r--tests/ref/lavf/dpx2
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index fa8a190aa2..de32e4e959 100644
--- a/libavcodec/dpxenc.c
+++ b/libavcodec/dpxenc.c
@@ -121,7 +121,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
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 95a02c255a..a852ae058e 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,3 +1,3 @@
-a80049454fe1f00233be79b87a4f9c07 *./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