Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avcodec/argo: use bits_per_coded_sample instead of bits_per_raw_sample

Browse Source 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
pull/359/head
Zane van Iperen 4 years ago
parent 55801421b3
commit f687f8e0d3
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
2 changed files with 3 additions and 3 deletions
Unified View
  1. 4
      libavcodec/argo.c
  2. 2
      libavcodec/version.h

4
libavcodec/argo.c
Unescape View File

@ -676,12 +676,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
ArgoContext *s = avctx->priv_data; ArgoContext *s = avctx->priv_data;
switch (avctx->bits_per_raw_sample) { switch (avctx->bits_per_coded_sample) {
case 8: s->bpp = 1; case 8: s->bpp = 1;
avctx->pix_fmt = AV_PIX_FMT_PAL8; break; avctx->pix_fmt = AV_PIX_FMT_PAL8; break;
case 24: s->bpp = 4; case 24: s->bpp = 4;
avctx->pix_fmt = AV_PIX_FMT_BGR0; break; avctx->pix_fmt = AV_PIX_FMT_BGR0; break;
default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_raw_sample); default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_coded_sample);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }

2
libavcodec/version.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save