diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:32:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:33:17 +0100 |
| commit | 3731c409890c2edd76ededfbc6038d940d2b0afb (patch) | |
| tree | cf93d3a6f855243773ae17932b825fac0748d734 | |
| parent | a00d4c5956e178296c31a631679618be4910ba5a (diff) | |
| parent | cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9 (diff) | |
| download | ffmpeg-3731c409890c2edd76ededfbc6038d940d2b0afb.tar.gz | |
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
png: Support rgb48 and rgba64 encoding
Conflicts:
libavcodec/pngenc.c
See: f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pngenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index be71c0ccbc..8d9eaa37dc 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -248,11 +248,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, is_progressive = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT); switch (avctx->pix_fmt) { case AV_PIX_FMT_RGBA64BE: - bit_depth = 16; + bit_depth = 16; color_type = PNG_COLOR_TYPE_RGB_ALPHA; break; case AV_PIX_FMT_RGB48BE: - bit_depth = 16; + bit_depth = 16; color_type = PNG_COLOR_TYPE_RGB; break; case AV_PIX_FMT_RGBA: |