diff options
| author | Mats Peterson <matsp888@yahoo.com> | 2016-02-20 12:59:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-21 03:53:38 +0100 |
| commit | 100167451af5b385c7c82e214e10bff410ba3516 (patch) | |
| tree | 59346f820e2fd4f955c5bbfbe39d1a3bd278623a /libavcodec/rawdec.c | |
| parent | bb629792a275f7231256be8e8a16e6f81671f36d (diff) | |
| download | ffmpeg-100167451af5b385c7c82e214e10bff410ba3516.tar.gz | |
lavc/rawdec: Remove monowhite switching code for 1 bpp AVI without a palette
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 3a2fac3ae4..eb9fe48b5f 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -128,10 +128,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) avctx->pix_fmt == AV_PIX_FMT_YUYV422) context->is_yuv2 = 1; - /* Temporary solution until PAL8 is implemented in nut */ - if (context->is_pal8 && avctx->bits_per_coded_sample == 1) - avctx->pix_fmt = AV_PIX_FMT_NONE; - return 0; } @@ -206,21 +202,6 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; } - /* Temporary solution until PAL8 is implemented in nut */ - if (avctx->pix_fmt == AV_PIX_FMT_NONE && - avctx->bits_per_coded_sample == 1 && - avctx->frame_number == 0 && - context->palette && - AV_RB64(context->palette->data) == 0xFFFFFFFF00000000 - ) { - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); - if (!pal) { - avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; - context->is_pal8 = 0; - context->is_mono = 1; - } else - avctx->pix_fmt = AV_PIX_FMT_PAL8; - } desc = av_pix_fmt_desc_get(avctx->pix_fmt); if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4 |