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

lavc/rawdec: Remove monowhite switching code for 1 bpp AVI without a palette

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Mats Peterson 2016-02-20 12:59:38 +01:00 committed by Michael Niedermayer
parent bb629792a2
commit 100167451a
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/rawdec.c
View File

@ -128,10 +128,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
avctx->pix_fmt == AV_PIX_FMT_YUYV422) avctx->pix_fmt == AV_PIX_FMT_YUYV422)
context->is_yuv2 = 1; 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; return 0;
} }
@ -206,21 +202,6 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA; 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); desc = av_pix_fmt_desc_get(avctx->pix_fmt);
if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4 if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4