Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:32:07 +0000 (15:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:33:17 +0000 (15:33 +0100)
commit3731c409890c2edd76ededfbc6038d940d2b0afb
treecf93d3a6f855243773ae17932b825fac0748d734
parenta00d4c5956e178296c31a631679618be4910ba5a
parentcccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'

* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
libavcodec/pngenc.c

See: f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pngenc.c