diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-08-13 01:35:10 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-08-13 01:35:10 +0200 |
| commit | bc7031265441a47595eadc39a44080e4e1fe208f (patch) | |
| tree | 50d05dfb0eff8967eb7174e0bdaa063f6ae59c2b | |
| parent | 777697a62c00fe17093f383388aaccaca486be93 (diff) | |
| download | ffmpeg-bc7031265441a47595eadc39a44080e4e1fe208f.tar.gz | |
lavc/screenpresso: Fix 32bit pix_fmt, there is no transparency.
Fixes a remaining issue of ticket #5025.
| -rw-r--r-- | libavcodec/screenpresso.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index 34efb03867..2fadca46b7 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -30,7 +30,7 @@ * rebuilt frame (not the reference), and since there is no coordinate system * they contain exactly as many pixel as the keyframe. * - * Supports: BGRA, BGR24, RGB555 + * Supports: BGR0, BGR24, RGB555 */ #include <stdint.h> @@ -129,7 +129,7 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_BGR24; break; case 4: - avctx->pix_fmt = AV_PIX_FMT_BGRA; + avctx->pix_fmt = AV_PIX_FMT_BGR0; break; default: av_log(avctx, AV_LOG_ERROR, "Invalid bits per pixel value (%d)\n", diff --git a/libavcodec/version.h b/libavcodec/version.h index 4ded1ee05f..306c28097e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 51 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |