diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-06 22:31:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-06 22:31:32 +0100 |
| commit | bfb988b1fafdc37f88aa64b49360cbbb64fa7e8e (patch) | |
| tree | 5fd0451cae428b0974a0dfdef93817d9dc5887ae | |
| parent | 1750b45cdf7498d0a05bea29cafcb26aa576d595 (diff) | |
| parent | d45fadb6df484b1c68867220f9c66890b7d29458 (diff) | |
| download | ffmpeg-bfb988b1fafdc37f88aa64b49360cbbb64fa7e8e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/tscc: Make 32bit output opaque.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/tscc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 628a6b3c36..f9b325b68d 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -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; } |