Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'

* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9': png: Support rgb48 and rgba64 encoding Conflicts: libavcodec/pngenc.c See: f94ce3bcab Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 3731c40989
parent a00d4c5956 cccac7654f
commit 3731c40989
1 changed files with 2 additions and 2 deletions
--- 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: