Browse Source

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/tscc: Make 32bit output opaque.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
commit
bfb988b1fa
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/tscc.c

+ 1
- 1
libavcodec/tscc.c View File

@@ -133,7 +133,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
case 24:
avctx->pix_fmt = AV_PIX_FMT_BGR24;
break;
case 32: avctx->pix_fmt = AV_PIX_FMT_RGB32; break;
case 32: avctx->pix_fmt = AV_PIX_FMT_0RGB32; break;
default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_coded_sample);
return AVERROR_PATCHWELCOME;
}


Loading…
Cancel
Save