[FFmpeg-cvslog] dpxenc: Dont store lavc indent when bitexact is set.
Michael Niedermayer
git at videolan.org
Tue Jan 17 01:41:24 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 17 01:37:59 2012 +0100| [905c4dc2b0d564e1b9b6bc6eeca0b8915b81cd8c] | committer: Michael Niedermayer
dpxenc: Dont store lavc indent when bitexact is set.
This avoids fate breakage from bumping version.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=905c4dc2b0d564e1b9b6bc6eeca0b8915b81cd8c
---
libavcodec/dpxenc.c | 4 +++-
tests/ref/lavf/dpx | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index fa8a190..de32e4e 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 95a02c2..a852ae0 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
More information about the ffmpeg-cvslog
mailing list