diff options
| author | ArnoB <ffmpeg@rgbaz.eu> | 2013-03-14 18:35:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-18 03:27:33 +0100 |
| commit | 69659389a3a423cf6320abaa549821d303ac1892 (patch) | |
| tree | 3791528be361fcefa8474bc8ae2814df0c85bd5b | |
| parent | 731902bd1951eb6d2f9b2c047127aabf73ca2a65 (diff) | |
| download | ffmpeg-69659389a3a423cf6320abaa549821d303ac1892.tar.gz | |
dpxenc: fix data offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361319d0f49475bc14c744194870f9bab78a8a83)
Conflicts:
tests/ref/lavf/dpx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dpxenc.c | 1 | ||||
| -rw-r--r-- | tests/ref/lavf/dpx | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index bd44b16ffc..f210bbc774 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -212,6 +212,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 1196934836..70371d8115 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 |