Commit bfb988b1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/tscc: Make 32bit output opaque.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1750b45c d45fadb6
...@@ -133,7 +133,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -133,7 +133,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
case 24: case 24:
avctx->pix_fmt = AV_PIX_FMT_BGR24; avctx->pix_fmt = AV_PIX_FMT_BGR24;
break; 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); default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_coded_sample);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment