Commit 78298bce authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/dpx: Reset n_datum for every new line when decoding 12bit.

Fixes odd unpacked 12bit decoding.
Reported-by: Piotr Bandurski
parent 28d33c25
...@@ -234,10 +234,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -234,10 +234,10 @@ static int decode_frame(AVCodecContext *avctx,
case 12: case 12:
if (!packing) { if (!packing) {
int tested = 0; int tested = 0;
if (descriptor == 50 && endian && (avctx->width%8) == 0) { // Little endian and widths not a multiple of 8 need tests if (descriptor == 50 && endian) { // Little endian needs tests
tested = 1; tested = 1;
} }
if (descriptor == 51 && endian && (avctx->width%2) == 0) { // Little endian and widths not a multiple of 2 need tests if (descriptor == 51 && endian) { // Little endian needs tests
tested = 1; tested = 1;
} }
if (!tested) { if (!tested) {
...@@ -422,6 +422,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -422,6 +422,7 @@ static int decode_frame(AVCodecContext *avctx,
&n_datum, endian); &n_datum, endian);
} }
} }
n_datum = 0;
for (i = 0; i < elements; i++) for (i = 0; i < elements; i++)
ptr[i] += p->linesize[i]; ptr[i] += p->linesize[i];
// Jump to next aligned position // Jump to next aligned position
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 20 #define LIBAVCODEC_VERSION_MINOR 20
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment