| Message ID | 20210718090123.126326-1-zane@zanevaniperen.com |
|---|---|
| State | Accepted |
| Commit | f687f8e0d3a5a4b2f0159a6b83e57f9df9a15f62 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/argo: use bits_per_coded_sample instead of bits_per_raw_sample | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Sun, Jul 18, 2021 at 07:01:22PM +1000, Zane van Iperen wrote: > Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> > --- > libavcodec/argo.c | 4 ++-- > libavcodec/version.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) both patches LGTM thx [...]
Will apply this and parts 3-8 of part 1 soon. On 18/7/21 7:01 pm, Zane van Iperen wrote: > Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> > --- > libavcodec/argo.c | 4 ++-- > libavcodec/version.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/argo.c b/libavcodec/argo.c > index 87c646f56c..057100bd12 100644 > --- a/libavcodec/argo.c > +++ b/libavcodec/argo.c > @@ -676,12 +676,12 @@ static av_cold int decode_init(AVCodecContext *avctx) > { > ArgoContext *s = avctx->priv_data; > > - switch (avctx->bits_per_raw_sample) { > + switch (avctx->bits_per_coded_sample) { > case 8: s->bpp = 1; > avctx->pix_fmt = AV_PIX_FMT_PAL8; break; > case 24: s->bpp = 4; > 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; > } > > diff --git a/libavcodec/version.h b/libavcodec/version.h > index c660f70669..91325ce4e7 100644 > --- a/libavcodec/version.h > +++ b/libavcodec/version.h > @@ -29,7 +29,7 @@ > > #define LIBAVCODEC_VERSION_MAJOR 59 > #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, \ > LIBAVCODEC_VERSION_MINOR, \ >
On Mon, Jul 19, 2021 at 10:53:40AM +1000, Zane van Iperen wrote:
> Will apply this and parts 3-8 of part 1 soon.
thanks for looking into this
[...]
diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 87c646f56c..057100bd12 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -676,12 +676,12 @@ static av_cold int decode_init(AVCodecContext *avctx) { ArgoContext *s = avctx->priv_data; - switch (avctx->bits_per_raw_sample) { + switch (avctx->bits_per_coded_sample) { case 8: s->bpp = 1; avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 24: s->bpp = 4; 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; } diff --git a/libavcodec/version.h b/libavcodec/version.h index c660f70669..91325ce4e7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #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, \ LIBAVCODEC_VERSION_MINOR, \
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> --- libavcodec/argo.c | 4 ++-- libavcodec/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)