[FFmpeg-cvslog] dpxenc: fix data offset

ArnoB git at videolan.org
Thu Mar 21 01:15:47 CET 2013


ffmpeg | branch: release/1.0 | ArnoB <ffmpeg at rgbaz.eu> | Thu Mar 14 18:35:55 2013 +0100| [becde6ab1c383e6774285e635b41dc21177a4b16] | committer: Michael Niedermayer

dpxenc: fix data offset

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 361319d0f49475bc14c744194870f9bab78a8a83)

Conflicts:

	tests/ref/lavf/dpx

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

 libavcodec/dpxenc.c |    1 +
 tests/ref/lavf/dpx  |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index 451b7b9..cc9457a 100644
--- a/libavcodec/dpxenc.c
+++ b/libavcodec/dpxenc.c
@@ -201,6 +201,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     buf[803] = s->bits_per_component;
     write16(buf + 804, (s->bits_per_component == 10 || s->bits_per_component == 12) ?
                        1 : 0); /* packing method */
+    write32(buf + 808, HEADER_SIZE); /* data offset */
 
     /* Image source information header */
     write32(buf + 1628, avctx->sample_aspect_ratio.num);
diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx
index 1196934..70371d8 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,9 +1,9 @@
-808ea110635774252439722a48329d61 *./tests/data/images/dpx/02.dpx
+d2f0b4e854fda2d3b3bee84cef80593c *./tests/data/images/dpx/02.dpx
 ./tests/data/images/dpx/%02d.dpx CRC=0x6da01946
 305792 ./tests/data/images/dpx/02.dpx
-5e1a777fa3f4094c9c4dd989cf9e8e8b *./tests/data/images/dpx/02.dpx
+075963c3c08978b6a20555ba09161434 *./tests/data/images/dpx/02.dpx
 ./tests/data/images/dpx/%02d.dpx CRC=0xe5b9c023
 609920 ./tests/data/images/dpx/02.dpx
-13dc41b1e1e36399a5e1f8b7e3344a81 *./tests/data/images/dpx/02.dpx
+b9f22728f8ff393bf30cf6cbd624fa95 *./tests/data/images/dpx/02.dpx
 ./tests/data/images/dpx/%02d.dpx CRC=0xf0a1c097
 407168 ./tests/data/images/dpx/02.dpx



More information about the ffmpeg-cvslog mailing list