Merge commit 'cccac765'

* commit 'cccac765': png: Support rgb48 and rgba64 encoding Conflicts: libavcodec/pngenc.c See: f94ce3bcMerged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cccac765'
* commit 'cccac765': png: Support rgb48 and rgba64 encoding Conflicts: libavcodec/pngenc.c See: f94ce3bcMerged-by: Michael Niedermayer <michaelni@gmx.at>
3731c409 · Michael Niedermayer · a00d4c59 · cccac765 · 3731c409
Commit 3731c409 authored Mar 17, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pngenc.c libavcodec/pngenc.c +2 -2

No files found.
--- 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: