diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2b9c7b32eb..0e3fb6a9de 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -799,6 +799,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov, } /* Encoder */ + if(!(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT)) { int pos = url_ftell(pb); put_be32(pb, 0); /* size */ diff --git a/libavformat/nut.c b/libavformat/nut.c index 56d733f7cb..1783b1606f 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -613,8 +613,10 @@ static int nut_write_header(AVFormatContext *s) put_str(bc, s->copyright); } /* encoder */ - put_v(bc, 13); /* type */ - put_str(bc, LIBAVFORMAT_IDENT); + if(!(s->streams[0]->codec.flags & CODEC_FLAG_BITEXACT)){ + put_v(bc, 13); /* type */ + put_str(bc, LIBAVFORMAT_IDENT); + } put_v(bc, 0); /* eof info */ update_packetheader(nut, bc, 0, 1); diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index df4e05c87d..51a86b530a 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -43,8 +43,8 @@ fea5b6c80b5e345cc48f72257814d7b8 *./data/a-h263p.avi 2398342 ./data/a-h263p.avi c6e070fb9505018402c5b87b8b12699d *./data/out.yuv stddev: 2.07 PSNR:41.77 bytes:7602176 -6503df2f0f02e938d8d9411ceec21fea *./data/a-odivx.mp4 - 562343 ./data/a-odivx.mp4 +aaa3b1355e276def2133ecb4d1db74ed *./data/a-odivx.mp4 +562315 ./data/a-odivx.mp4 33d3e1f41f1dcb99676e661ba9aa766f *./data/out.yuv stddev: 8.05 PSNR:30.00 bytes:7602176 5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 8b7a04ad46..7d0c7225c6 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -19,11 +19,11 @@ f13889dd08a4968e2b783771c7a29229 *./data/b-libav.ffm 9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv 336334 ./data/b-libav.flv ./data/b-libav.flv CRC=8a731c32 -c5cfe6177bc495372585e5e9c63f3e64 *./data/b-libav.mov - 365341 ./data/b-libav.mov +98d03f5df0229bb1a89dd25f9165e3db *./data/b-libav.mov +365313 ./data/b-libav.mov ./data/b-libav.mov CRC=1bd6add1 -f6df4c2011d754b14a67d879b15401b8 *./data/b-libav.nut -327789 ./data/b-libav.nut +2afb556fe26d21edaeb14c777bafd1dd *./data/b-libav.nut +327771 ./data/b-libav.nut ./data/b-libav.nut CRC=658838d9 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm 317075 ./data/b-libav.pbm diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 940ef873ad..5d87e5c17c 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -43,8 +43,8 @@ b018228ed1c0a283e735d1a7d84c9b2e *./data/a-h263p.avi 869156 ./data/a-h263p.avi bdb990f96fa93ec84c69e45d5f7c539c *./data/out.yuv stddev: 1.91 PSNR:42.46 bytes:7602176 -84297b539399adaf46478a8d9b7f8caa *./data/a-odivx.mp4 - 124169 ./data/a-odivx.mp4 +a45700f7baffe36bec81a42b124e739e *./data/a-odivx.mp4 +124141 ./data/a-odivx.mp4 c7d19f4c7905421ad8f21cde578342e0 *./data/out.yuv stddev: 5.44 PSNR:33.40 bytes:7602176 242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi