github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-05-01 06:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-06 22:31:29 +01:00
parent 1750b45cdf d45fadb6df
commit bfb988b1fa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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;
}