virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc/8bps: Fix 32bit output of 24bit video.

Browse Source 
Regression since / partial revert of ba3bb53b
This commit is contained in:
Carl Eugen Hoyos 2016-09-28 17:49:39 +02:00
parent 58776ccbdb
commit 83bf40f3cf
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/8bps.c
View File

@ -41,7 +41,7 @@
static const enum AVPixelFormat pixfmt_rgb24[] = { static const enum AVPixelFormat pixfmt_rgb24[] = {
AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }; AV_PIX_FMT_BGR24, AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE };
typedef struct EightBpsContext { typedef struct EightBpsContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@ -65,6 +65,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
unsigned int dlen, p, row; unsigned int dlen, p, row;
const unsigned char *lp, *dp, *ep; const unsigned char *lp, *dp, *ep;
unsigned char count; unsigned char count;
unsigned int px_inc;
unsigned int planes = c->planes; unsigned int planes = c->planes;
unsigned char *planemap = c->planemap; unsigned char *planemap = c->planemap;
int ret; int ret;
@ -77,6 +78,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
/* Set data pointer after line lengths */ /* Set data pointer after line lengths */
dp = encoded + planes * (height << 1); dp = encoded + planes * (height << 1);
px_inc = planes + (avctx->pix_fmt == AV_PIX_FMT_0RGB32);
for (p = 0; p < planes; p++) { for (p = 0; p < planes; p++) {
/* Lines length pointer for this plane */ /* Lines length pointer for this plane */
lp = encoded + p * (height << 1); lp = encoded + p * (height << 1);
@ -95,21 +98,21 @@ static int decode_frame(AVCodecContext *avctx, void *data,
if ((count = *dp++) <= 127) { if ((count = *dp++) <= 127) {
count++; count++;
dlen -= count + 1; dlen -= count + 1;
if (pixptr_end - pixptr < count * planes) if (pixptr_end - pixptr < count * px_inc)
break; break;
if (ep - dp < count) if (ep - dp < count)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
while (count--) { while (count--) {
*pixptr = *dp++; *pixptr = *dp++;
pixptr += planes; pixptr += px_inc;
} }
} else { } else {
count = 257 - count; count = 257 - count;
if (pixptr_end - pixptr < count * planes) if (pixptr_end - pixptr < count * px_inc)
break; break;
while (count--) { while (count--) {
*pixptr = *dp; *pixptr = *dp;
pixptr += planes; pixptr += px_inc;
} }
dp++; dp++;
dlen -= 2; dlen -= 2;

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 58 #define LIBAVCODEC_VERSION_MINOR 58
#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, \