Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:43:21 +0000 (15:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:43:55 +0000 (15:43 +0100)
commitc738ffcf2c0717ed3546ea7e0d06cc4df2026024
treee4074b6c4df0bc579ef52be714524c21e9c5ce4c
parent3731c409890c2edd76ededfbc6038d940d2b0afb
parent58c215961a9067bb670387bbd72286c30de04b93
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'

* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
libavcodec/raw.c
libavformat/nut.c

See: edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nut.c